sablink/molecules
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[scripts] drop any /etc/conf.d references

Browse Source
This commit is contained in:
Fabio Erculiani
2014-04-03 17:35:19 +02:00
parent 0231bfe796
commit fd0139151f
3 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/amazon_ebs_image_inner_chroot_script_after.sh
View File

@@ -43,9 +43,6 @@ useradd -d /home/ec2-user -k /etc/skel -g users -G wheel,disk,crontab \
echo -e "\n# molecule generated rule\nec2-user ALL=NOPASSWD: ALL" \
>> /etc/sudoers
# setup UTC clock
sed -i 's:clock=".*":clock="UTC":' /etc/conf.d/hwclock || exit 1
# setup fstab
echo "# molecule generated fstab
LABEL=/ / ext4 defaults 1 1

3
scripts/image_generic_inner_chroot_script_after.sh
View File

@@ -29,9 +29,6 @@ sd_enable sshd
# delete root password, only ssh allowed
passwd -d root
# setup UTC clock
sed -i 's:clock=".*":clock="UTC":' /etc/conf.d/hwclock || exit 1
# setup fstab
# TODO: really needed?
echo "# molecule generated fstab

5
scripts/remaster_generic_inner_chroot_script_after.sh
View File

@@ -95,19 +95,14 @@ switch_kernel() {
setup_displaymanager() {
# determine what is the login manager
if [ -n "$(equo match --installed gnome-base/gdm -qv)" ]; then
sed -i 's/DISPLAYMANAGER=".*"/DISPLAYMANAGER="gdm"/g' /etc/conf.d/xdm
sd_enable gdm
elif [ -n "$(equo match --installed lxde-base/lxdm -qv)" ]; then
sed -i 's/DISPLAYMANAGER=".*"/DISPLAYMANAGER="lxdm"/g' /etc/conf.d/xdm
sd_enable lxdm
elif [ -n "$(equo match --installed x11-misc/lightdm-base -qv)" ]; then
sed -i 's/DISPLAYMANAGER=".*"/DISPLAYMANAGER="lightdm"/g' /etc/conf.d/xdm
sd_enable lightdm
elif [ -n "$(equo match --installed kde-base/kdm -qv)" ]; then
sed -i 's/DISPLAYMANAGER=".*"/DISPLAYMANAGER="kdm"/g' /etc/conf.d/xdm
sd_enable kdm
else
sed -i 's/DISPLAYMANAGER=".*"/DISPLAYMANAGER="xdm"/g' /etc/conf.d/xdm
sd_enable xdm
fi
}