From 6cbf0b00cab44789d6b59814dbf6a7b6a1e1d7b7 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 3 Jul 2011 10:37:52 +0200 Subject: [PATCH] [molecules] serverbase: switch back to NetworkManager (it is required by Anaconda, it must be running) --- molecules/serverbase.common | 2 +- ...sh => remaster_serverbase_inner_chroot_script_after.sh} | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) rename scripts/{remaster_nox_inner_chroot_script_after.sh => remaster_serverbase_inner_chroot_script_after.sh} (74%) diff --git a/molecules/serverbase.common b/molecules/serverbase.common index 3cc25dd..5f3074d 100644 --- a/molecules/serverbase.common +++ b/molecules/serverbase.common @@ -20,7 +20,7 @@ inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_nox_inner_chroot_script_after.sh serverbase +inner_chroot_script_after: /sabayon/scripts/remaster_serverbase_inner_chroot_script_after.sh # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) diff --git a/scripts/remaster_nox_inner_chroot_script_after.sh b/scripts/remaster_serverbase_inner_chroot_script_after.sh similarity index 74% rename from scripts/remaster_nox_inner_chroot_script_after.sh rename to scripts/remaster_serverbase_inner_chroot_script_after.sh index d4a3f61..cd27b5b 100755 --- a/scripts/remaster_nox_inner_chroot_script_after.sh +++ b/scripts/remaster_serverbase_inner_chroot_script_after.sh @@ -1,15 +1,14 @@ #!/bin/sh -# For Spins without X.Org -flavour="${1}" rc-update del installer-gui boot rc-update del x-setup boot rc-update del hald boot -rc-update del NetworkManager default rc-update del avahi-daemon default +# A RUNNING NetworkManager is required by Anaconda !! # re-enable rc_hotplug -sed -i 's:^rc_hotplug=.*:rc_hotplug="*":g' /etc/rc.conf +# sed -i 's:^rc_hotplug=.*:rc_hotplug="*":g' /etc/rc.conf +# rc-update del NetworkManager default # install-data dir is really not needed rm -rf /install-data