[Fai-commit] r4466 - people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks

[lazyboy-guest at alioth.debian.org]

Author: lazyboy-guest
Date: 2007-07-21 21:16:45 +0000 (Sat, 21 Jul 2007)
New Revision: 4466

Removed:
   people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/finish.RHEL-NETINSTALL
Modified:
   people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/finish.DIST-RHEL_5
   people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/prepareapt.DEFAULT
   people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/prepareapt.DIST-RHEL_5
Log:
some hacks for getting yum to work for dirinstall, too - maybe this should rather be fixed in the base images script... still, it works for dirinstall that way

Modified: people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/finish.DIST-RHEL_5
===================================================================
--- people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/finish.DIST-RHEL_5	2007-07-20 10:33:59 UTC (rev 4465)
+++ people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/finish.DIST-RHEL_5	2007-07-21 21:16:45 UTC (rev 4466)
@@ -1,3 +1,7 @@
-#! /bin/sh
-$ROOTCMD umount /proc/sys/fs/binfmt_misc/
-$ROOTCMD umount /proc
+#! /bin/bash
+
+umount $target/proc/sys/fs/binfmt_misc/
+umount  $target/proc
+
+umount $target/sys
+

Deleted: people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/finish.RHEL-NETINSTALL
===================================================================
--- people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/finish.RHEL-NETINSTALL	2007-07-20 10:33:59 UTC (rev 4465)
+++ people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/finish.RHEL-NETINSTALL	2007-07-21 21:16:45 UTC (rev 4466)
@@ -1,6 +0,0 @@
-#! /bin/bash
-
-umount  $target/proc
-
-umount $target/sys
-

Modified: people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/prepareapt.DEFAULT
===================================================================
--- people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/prepareapt.DEFAULT	2007-07-20 10:33:59 UTC (rev 4465)
+++ people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/prepareapt.DEFAULT	2007-07-21 21:16:45 UTC (rev 4466)
@@ -13,7 +13,12 @@
 fi
 
 # we need these to install packages via network
-[ -f /tmp/etc/resolv.conf ] && cp /tmp/etc/resolv.conf $FAI_ROOT/etc
+if [ -f /tmp/etc/resolv.conf ]; then
+	cp /tmp/etc/resolv.conf $FAI_ROOT/etc
+else 
+	cp /etc/resolv.conf $FAI_ROOT/etc
+fi
+
 [ -f /etc/hosts ] && cp /etc/hosts $FAI_ROOT/etc
 # set hostname in $FAI_ROOT
 if [ -f /var/run/fai//FAI_INSTALLATION_IN_PROGRESS ]; then

Modified: people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/prepareapt.DIST-RHEL_5
===================================================================
--- people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/prepareapt.DIST-RHEL_5	2007-07-20 10:33:59 UTC (rev 4465)
+++ people/lazyboy/rhel-install-fixes_3.1.8/examples/rhel-install-demo/hooks/prepareapt.DIST-RHEL_5	2007-07-21 21:16:45 UTC (rev 4466)
@@ -2,11 +2,15 @@
 
 # copy all yum files, and make sure Core is installed
 
+# TODO: the mounting and groupinstall should be done at base image creation
+# time!
+# maybe the missings mounts were the cause for the group Core not being fully
+# installed?
 
-ifclass RHEL-NETINSTALL && {
-	mount -o bind /proc $target/proc
-	mount -o bind /sys $target/sys
-}
+#ifclass RHEL-NETINSTALL && {
+mount -o bind /proc $target/proc
+mount -o bind /sys $target/sys
+#}
 
 fcopy -r /etc/yum.repos.d/
 $ROOTCMD yum groupinstall -y Core