diff --git a/scripts/amazon_ebs_image_inner_chroot_script_after.sh b/scripts/amazon_ebs_image_inner_chroot_script_after.sh index a79a297..d41ae3e 100755 --- a/scripts/amazon_ebs_image_inner_chroot_script_after.sh +++ b/scripts/amazon_ebs_image_inner_chroot_script_after.sh @@ -21,20 +21,15 @@ echo "ec2-user is the expected user" echo # setup networking, make sure networkmanager is gone -rc-update add NetworkManager default || rc-update add net.eth0 default sd_enable NetworkManager sd_enable ModemManager # drop other useless services -rc-update del sabayonlive boot sd_disable sabayonlive -rc-update del x-setup boot # Enable ssh -rc-update add sshd default sd_enable sshd # Enable cron -rc-update add vixie-cron default sd_enable vixie-cron # delete root password, only ssh allowed diff --git a/scripts/image_generic_inner_chroot_script_after.sh b/scripts/image_generic_inner_chroot_script_after.sh index 2b872ea..2113063 100755 --- a/scripts/image_generic_inner_chroot_script_after.sh +++ b/scripts/image_generic_inner_chroot_script_after.sh @@ -18,18 +18,12 @@ echo "Configuring AMI chroot" echo # setup networking, make sure networkmanager is gone -rc-update del networkmanager default &> /dev/null sd_disable NetworkManager -# add eth0, should get dhcp by default already -rc-update add net.eth0 default # drop other useless services -rc-update del sabayonlive boot -rc-update del x-setup boot sd_disable sabayonlive # Enable ssh -rc-update add sshd default sd_enable sshd # delete root password, only ssh allowed diff --git a/scripts/inner_chroot_script.sh b/scripts/inner_chroot_script.sh index 7ac804c..50974ca 100755 --- a/scripts/inner_chroot_script.sh +++ b/scripts/inner_chroot_script.sh @@ -65,9 +65,6 @@ rm -rf /etc/ssl/postfix/server.* # make sure postfix only listens on localhost echo "inet_interfaces = localhost" >> /etc/postfix/main.cf -# do not add it yet to runlevel -# rc-update add postfix default - # allow root logins to the livecd by default # turn bashlogin shells to actual login shells sed -i 's:exec -l /bin/bash:exec -l /bin/bash -l:' /bin/bashlogin @@ -91,12 +88,8 @@ if [ -n "${is_ply_sabayon}" ]; then else plymouth-set-default-theme solar fi -# and make sure that fbcondecor is removed -rc-update del fbcondecor boot -rc-update del fbcondecor default # enable cd eject on shutdown/reboot -rc-update add cdeject shutdown sd_enable cdeject # Activate services for systemd diff --git a/scripts/mkloopcard_chroot.include b/scripts/mkloopcard_chroot.include index 72eefc6..a97e45b 100644 --- a/scripts/mkloopcard_chroot.include +++ b/scripts/mkloopcard_chroot.include @@ -57,10 +57,8 @@ setup_bootfs_fstab() { setup_boot() { sd_enable sshd - rc-update add sshd default sd_enable vixie-cron sd_enable NetworkManager - rc-update add NetworkManager default eselect uimage set 1 } diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh index f0a2886..b7774ba 100755 --- a/scripts/remaster_generic_inner_chroot_script_after.sh +++ b/scripts/remaster_generic_inner_chroot_script_after.sh @@ -46,26 +46,12 @@ basic_environment_setup() { eselect opengl set xorg-x11 eselect mesa set --auto - # automatically start xdm - rc-update del xdm boot - rc-update add xdm default - # systemd has specific targets depending on the DM - - # consolekit must be run at boot level - rc-update add consolekit boot - # systemd uses logind - - rc-update del sabayon-mce default sd_disable sabayon-mce - rc-update add nfsmount default # setup avahi - rc-update add avahi-daemon default sd_enable avahi-daemon # setup printing - rc-update add cupsd default - rc-update add cups-browsed default sd_enable cups sd_enable cups-browsed @@ -80,17 +66,14 @@ basic_environment_setup() { } setup_cpufrequtils() { - rc-update add cpufrequtils default sd_enable cpufrequtils } setup_sabayon_mce() { - rc-update add sabayon-mce boot sd_enable sabayon-mce } setup_sabayon_steambox() { - rc-update add steambox boot sd_enable steambox } @@ -137,10 +120,6 @@ setup_default_xsession() { } setup_networkmanager() { - rc-update del NetworkManager default - rc-update del NetworkManager - rc-update add NetworkManager default - rc-update add NetworkManager-setup default sd_enable NetworkManager sd_enable ModemManager } @@ -180,7 +159,6 @@ setup_virtualbox() { install_kernel_packages \ "app-emulation/virtualbox-guest-additions" \ "x11-drivers/xf86-video-virtualbox" - rc-update add virtualbox-guest-additions boot sd_enable virtualbox-guest-additions } @@ -389,9 +367,6 @@ prepare_gnome() { else setup_default_xsession "gnome" fi - rc-update del system-tools-backends boot - rc-update add system-tools-backends default - # no systemd counterpart setup_sabayon_mce setup_sabayon_steambox diff --git a/scripts/remaster_serverbase_inner_chroot_script_after.sh b/scripts/remaster_serverbase_inner_chroot_script_after.sh index c58d9be..272cd36 100755 --- a/scripts/remaster_serverbase_inner_chroot_script_after.sh +++ b/scripts/remaster_serverbase_inner_chroot_script_after.sh @@ -13,18 +13,9 @@ sd_disable() { systemctl --no-reload -f disable "${1}.service" } -rc-update del installer-gui boot -rc-update del x-setup boot -rc-update del avahi-daemon default - sd_disable installer-gui sd_disable avahi-daemon -# A RUNNING NetworkManager is required by Anaconda !! -# re-enable rc_hotplug -# 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 diff --git a/scripts/tar_generic_inner_chroot_script_after.sh b/scripts/tar_generic_inner_chroot_script_after.sh index 429e63c..e81c4aa 100755 --- a/scripts/tar_generic_inner_chroot_script_after.sh +++ b/scripts/tar_generic_inner_chroot_script_after.sh @@ -6,29 +6,6 @@ # remove sabayonuser userdel sabayonuser -DROP_SERVICES=" - alsasound - avahi-daemon - consolefont - dbus - fbcondecor - fsck - hotplug - hwclock - installer-gui - installer-text - keymaps - lvm - mdadm - netmount - NetworkManager - ModemManager - sabayonlive - swap - swapfiles - termencoding - x-setup -" SYSTEMD_DROP_SERVICES=" alsa-store alsa-restore @@ -42,14 +19,6 @@ SYSTEMD_DROP_SERVICES=" x-setup " -for serv in ${DROP_SERVICES}; do - rc-update del ${serv} default - rc-update del ${serv} boot -done -rc-update add vixie-cron default -rc-update del udev sysinit -rc-update del dmesg sysinit - for serv in ${SYSTEMD_DROP_SERVICES}; do systemctl --no-reload -f disable "${serv}.service" done