[Fai-commit] r6165 - branches/experimental/patches
Michael Tautschnig
mt at alioth.debian.org
Sun Oct 17 08:27:03 UTC 2010
Author: mt
Date: 2010-10-17 08:26:57 +0000 (Sun, 17 Oct 2010)
New Revision: 6165
Modified:
branches/experimental/patches/grub-in-target
Log:
The base system should better be extracted before we attempt to bind-mount /dev
and /proc
Modified: branches/experimental/patches/grub-in-target
===================================================================
--- branches/experimental/patches/grub-in-target 2010-10-16 13:20:49 UTC (rev 6164)
+++ branches/experimental/patches/grub-in-target 2010-10-17 08:26:57 UTC (rev 6165)
@@ -9,28 +9,28 @@
===================================================================
--- trunk.orig/lib/subroutines
+++ trunk/lib/subroutines
-@@ -421,6 +421,13 @@
- sendmon "TASKERROR mountdisks 705"
- task_error 705
+@@ -494,6 +494,7 @@
+ die "Internal error when calling /tmp/rebootCD."
fi
+ umount $FAI_ROOT/proc
++ umount $FAI_ROOT/dev
+ umount -ar
+ exec reboot -dfi
+ }
+@@ -818,6 +819,13 @@
+ [ -f $LOGDIR/crypttab ] && cp -p $LOGDIR/crypttab $FAI_ROOT/etc/crypttab
+ # make /var/lib/dpkg a ramdisk
+ mkramdisk -a
+ # mount /dev and /proc on target otherwise grub-installer will fail
+ mount -o bind /dev $FAI_ROOT/dev
-+ task_error 706 $?
++ task_error 802 $?
+ if [ ! -e $FAI_ROOT/proc/version ]; then
+ mount -o bind /proc $FAI_ROOT/proc
-+ task_error 707 $?
++ task_error 803 $?
+ fi
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- task_configure() {
-@@ -494,6 +501,7 @@
- die "Internal error when calling /tmp/rebootCD."
- fi
- umount $FAI_ROOT/proc
-+ umount $FAI_ROOT/dev
- umount -ar
- exec reboot -dfi
- }
+ ### BEGIN SUBROUTINE INFO
Index: trunk/examples/simple/files/boot/grub/menu.lst/postinst
===================================================================
--- trunk.orig/examples/simple/files/boot/grub/menu.lst/postinst
More information about the Fai-commit
mailing list