diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | pbuilder-user-mode-linux | 9 |
3 files changed, 21 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2007-01-30 Junichi Uekawa <dancer@debian.org> + + * pbuilder-user-mode-linux: Mattia Dongili: "As rootstrap allows + this configuration it would be nice if pbuilder-uml was aware of + it too and mount /lib/modules early enough to avoid errors and + warnings." + 2007-01-22 Junichi Uekawa <dancer@debian.org> * pbuilderrc: default is now --variant=buildd for debootstrap option diff --git a/debian/changelog b/debian/changelog index dc64b17..7ee9b36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,11 @@ pbuilder (0.164) UNRELEASED; urgency=low [ Loic Minier ] * Document usage in a vserver environment. - -- Loic Minier <lool@dooz.org> Wed, 24 Jan 2007 18:50:48 +0100 + [ Mattia Dongili ] + * Bug fix: "pbuilder-uml: allow pbuilder-user-mode-linux to mount + /lib/modules on the host", thanks to Mattia Dongili (Closes: #406845). + + -- Junichi Uekawa <dancer@debian.org> Tue, 30 Jan 2007 23:35:56 +0900 pbuilder (0.163) unstable; urgency=low diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux index 1085b02..41fe070 100755 --- a/pbuilder-user-mode-linux +++ b/pbuilder-user-mode-linux @@ -75,6 +75,12 @@ if ! mount -t ext2 /dev/ubdb ${UML_CHROOT_MOUNTPOINT}; then fi mount --bind ${UML_CHROOT_MOUNTPOINT}/dev /dev +# mount /lib/modules on the hostfs +kernel_modules=\$(sed -ne 's\$.*/lib/modules.*hostfs.*defaults,ro,\([^[:space:]]*\).*\$\1\$p' ${UML_CHROOT_MOUNTPOINT}/etc/fstab) +if [ -n "\${kernel_modules}" ] ; then + echo " -> Mount /lib/modules on the host \${kernel_modules}" + mount -t hostfs -o ro,\${kernel_modules} hostfs /lib/modules +fi export LOGNAME="${LOGNAME}" export HOME="${HOME}" @@ -133,6 +139,9 @@ fi pbuilder "$1" ${UML_EXTRAOPT} \${EXTRAOPT[@]} --buildresult "\${BUILDRESULT}" --buildplace "${UML_CHROOT_MOUNTPOINT}" --internal-build-uml ${UML_DEBUGMODE:+--debug} ${BUILDING_DSC_FILE} ${UML_EXECUTE_EXTRAOPT} echo \$? > /proc/exitcode +if [ -n "\${kernel_modules}" ] ; then + umount /lib/modules +fi umount /dev umount ${UML_CHROOT_MOUNTPOINT} /sbin/halt -d -f |