[d-i-commits] r32012 - in trunk/packages/debian-installer-utils: . debian

[Frans Pop]

Author: fjp
Date: 2005-11-14 01:15:16 +0000 (Mon, 14 Nov 2005)
New Revision: 32012

Modified:
   trunk/packages/debian-installer-utils/apt-install
   trunk/packages/debian-installer-utils/debian/changelog
Log:
Also mount /target/sys in apt-install to support installation of 2.6.14
and higher kernels using yaird/initramfs-tools


Modified: trunk/packages/debian-installer-utils/apt-install
===================================================================
--- trunk/packages/debian-installer-utils/apt-install	2005-11-13 18:50:15 UTC (rev 32011)
+++ trunk/packages/debian-installer-utils/apt-install	2005-11-14 01:15:16 UTC (rev 32012)
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+KERNEL_MAJOR="$(uname -r | cut -d . -f 1,2)"
+
 queue=/var/lib/apt-install/queue
 
 mountpoints () {
@@ -87,11 +89,21 @@
 mountpoints > /tmp/mount.pre
 
 # Some packages (eg. the kernel-image package) require a mounted /proc/
-# Only mount it if it isn't mounted already
+# Only mount it if not mounted already
 if [ ! -f /target/proc/cmdline ] ; then
 	mount -t proc proc /target/proc
 fi
 
+# For installing >=2.6.14 kernels we also need sysfs mounted
+# Only mount it if not mouted already and we're running 2.6
+case $KERNEL_MAJOR in
+    2.6)
+	if [ ! -d /target/sys/devices ] ; then
+		mount -t sysfs none /target/sys
+	fi
+	;;
+esac
+
 disable_daemons
 ERRCODE=0
 log-output -t apt-install chroot /target apt-get -y install $@ < /dev/null || ERRCODE=$?

Modified: trunk/packages/debian-installer-utils/debian/changelog
===================================================================
--- trunk/packages/debian-installer-utils/debian/changelog	2005-11-13 18:50:15 UTC (rev 32011)
+++ trunk/packages/debian-installer-utils/debian/changelog	2005-11-14 01:15:16 UTC (rev 32012)
@@ -6,8 +6,12 @@
   [ Colin Watson ]
   * Add myself to debian/copyright for log-output.
 
- -- Joey Hess <joeyh at debian.org>  Thu,  6 Oct 2005 23:34:10 -0400
+  [ Frans Pop ]
+  * Also mount /target/sys in apt-install to support installation of 2.6.14
+    and higher kernels using yaird/initramfs-tools.
 
+ -- Frans Pop <fjp at debian.org>  Mon, 14 Nov 2005 02:12:49 +0100
+
 debian-installer-utils (1.16) unstable; urgency=low
 
   [ Colin Watson ]