diff --git a/platforms/livecd-gnome-root/post.inc.sh b/platforms/livecd-gnome-root/post.inc.sh index 8e71411..504f351 100644 --- a/platforms/livecd-gnome-root/post.inc.sh +++ b/platforms/livecd-gnome-root/post.inc.sh @@ -1,11 +1,3 @@ -# configure GDM for autologin -# -cat > $MOUNTDIR/etc/gdm/custom.conf << _EOF -[daemon] -AutomaticLoginEnable=true -AutomaticLogin=liveuser -_EOF - ## provide a basilar gtkrc (to be improved) #cat > $MOUNTDIR/etc/gtk-2.0/gtkrc << _EOF #gtk-theme-name = "Default" diff --git a/platforms/livecd-light-root/post.inc.sh b/platforms/livecd-light-root/post.inc.sh index 65c5fd9..b1121ea 100644 --- a/platforms/livecd-light-root/post.inc.sh +++ b/platforms/livecd-light-root/post.inc.sh @@ -1,7 +1,3 @@ -# configure LXDM for autologin -# -sed -i "s|# autologin.*|autologin=liveuser|" $MOUNTDIR/etc/lxdm/lxdm.conf - # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh index c5231c8..73bb7a2 100644 --- a/platforms/livecd-root/post.inc.sh +++ b/platforms/livecd-root/post.inc.sh @@ -1,14 +1,3 @@ -# configure KDM for autologin -# -if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then - sed -i 's|[#]*AutoLoginEnable=.*|AutoLoginEnable=true|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc - sed -i 's|[#]*AutoReLogin=.*|AutoReLogin=true|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc - sed -i 's|[#]*AutoLoginUser=.*|AutoLoginUser=liveuser|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc -fi - # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri @@ -33,10 +22,13 @@ chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do # remove kernel headers installed by dkms chroot $MOUNTDIR smart remove kernel-${K}-headers -y - # remove unused initramfs generated by kernel - rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img* - # remove failsafe image to save space for livecd - rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img* +done +# remove unused initramfs generated by kernel +for f in $MOUNTDIR/boot/initramfs-*.img*; do + case "$f" in + *failsafe*) continue ;; + *) rm -f $f ;; + esac done # remove some documentation to save space on CD diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index 6ab5e1c..19c5018 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -1,14 +1,3 @@ -# configure KDM for autologin -# -if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then - sed -i 's|[#]*AutoLoginEnable=.*|AutoLoginEnable=true|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc - sed -i 's|[#]*AutoReLogin=.*|AutoReLogin=true|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc - sed -i 's|[#]*AutoLoginUser=.*|AutoLoginUser=liveuser|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc -fi - # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri diff --git a/platforms/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh index f5b2e3f..795ee8b 100644 --- a/platforms/livegames-root/post.inc.sh +++ b/platforms/livegames-root/post.inc.sh @@ -1,14 +1,3 @@ -# configure KDM for autologin -# -if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then - sed -i 's|[#]*AutoLoginEnable=.*|AutoLoginEnable=true|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc - sed -i 's|[#]*AutoReLogin=.*|AutoReLogin=true|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc - sed -i 's|[#]*AutoLoginUser=.*|AutoLoginUser=liveuser|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc -fi - # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri diff --git a/platforms/rootfs-light/post.inc.sh b/platforms/rootfs-light/post.inc.sh index aa552ae..d0eb1e7 100644 --- a/platforms/rootfs-light/post.inc.sh +++ b/platforms/rootfs-light/post.inc.sh @@ -44,10 +44,6 @@ TSLIB_CALIBFILE=/etc/pointercal HOME=/root _EOF -# configure LXDM for autologin -# -sed -i "s|# autologin.*|autologin=liveuser|" $MOUNTDIR/etc/lxdm/lxdm.conf - # remove some documentation to save space for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \; diff --git a/platforms/rootfs/post.inc.sh b/platforms/rootfs/post.inc.sh index 855e65d..55fc98a 100644 --- a/platforms/rootfs/post.inc.sh +++ b/platforms/rootfs/post.inc.sh @@ -44,17 +44,6 @@ TSLIB_CALIBFILE=/etc/pointercal HOME=/root _EOF -# configure KDM for autologin -# -if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then - sed -i 's|[#]*AutoLoginEnable=.*|AutoLoginEnable=true|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc - sed -i 's|[#]*AutoReLogin=.*|AutoReLogin=true|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc - sed -i 's|[#]*AutoLoginUser=.*|AutoLoginUser=liveuser|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc -fi - # configure favorites in kde menu for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f diff --git a/platforms/testcd-root/post.inc.sh b/platforms/testcd-root/post.inc.sh index 58aeb63..a0a9241 100644 --- a/platforms/testcd-root/post.inc.sh +++ b/platforms/testcd-root/post.inc.sh @@ -1,14 +1,3 @@ -# configure KDM for autologin -# -if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then - sed -i 's|[#]*AutoLoginEnable=.*|AutoLoginEnable=true|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc - sed -i 's|[#]*AutoReLogin=.*|AutoReLogin=true|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc - sed -i 's|[#]*AutoLoginUser=.*|AutoLoginUser=liveuser|' \ - $MOUNTDIR/opt/kde/share/config/kdm/kdmrc -fi - # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri @@ -28,10 +17,15 @@ chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do # remove kernel headers installed by dkms chroot $MOUNTDIR smart remove kernel-${K}-headers -y - # remove unused initramfs generated by kernel - rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img* # remove failsafe image to save space for livecd - rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img* + #rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img* +done +# remove unused initramfs generated by kernel +for f in $MOUNTDIR/boot/initramfs-*.img* do + case "$f" in + *failsafe*) continue ;; + *) rm -f $f ;; + esac done # remove some documentation to save space on CD