openmamba/makedist-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove autologin configuration for display manages, now done in livecd-tools

Browse Source
This commit is contained in:
Silvan Calarco 2015-02-28 23:16:51 +01:00
parent 16127b652d
commit d656ee17e0
8 changed files with 15 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platforms/livecd-gnome-root/post.inc.sh
View File

@ -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) ## provide a basilar gtkrc (to be improved)
#cat > $MOUNTDIR/etc/gtk-2.0/gtkrc << _EOF #cat > $MOUNTDIR/etc/gtk-2.0/gtkrc << _EOF
#gtk-theme-name = "Default" #gtk-theme-name = "Default"

4
platforms/livecd-light-root/post.inc.sh
View File

@ -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 # FIXME: ensure alternatives are correclty set
chroot $MOUNTDIR update-alternatives-set-dri chroot $MOUNTDIR update-alternatives-set-dri

22
platforms/livecd-root/post.inc.sh
View File

@ -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 # FIXME: ensure alternatives are correclty set
chroot $MOUNTDIR update-alternatives-set-dri 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 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# remove kernel headers installed by dkms # remove kernel headers installed by dkms
chroot $MOUNTDIR smart remove kernel-${K}-headers -y chroot $MOUNTDIR smart remove kernel-${K}-headers -y
# remove unused initramfs generated by kernel done
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img* # remove unused initramfs generated by kernel
# remove failsafe image to save space for livecd for f in $MOUNTDIR/boot/initramfs-*.img*; do
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img* case "$f" in
*failsafe*) continue ;;
*) rm -f $f ;;
esac
done done
# remove some documentation to save space on CD # remove some documentation to save space on CD

11
platforms/livedvd-root/post.inc.sh
View File

@ -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 # FIXME: ensure alternatives are correclty set
chroot $MOUNTDIR update-alternatives-set-dri chroot $MOUNTDIR update-alternatives-set-dri

11
platforms/livegames-root/post.inc.sh
View File

@ -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 # FIXME: ensure alternatives are correclty set
chroot $MOUNTDIR update-alternatives-set-dri chroot $MOUNTDIR update-alternatives-set-dri

4
platforms/rootfs-light/post.inc.sh
View File

@ -44,10 +44,6 @@ TSLIB_CALIBFILE=/etc/pointercal
HOME=/root HOME=/root
_EOF _EOF
# configure LXDM for autologin
#
sed -i "s|# autologin.*|autologin=liveuser|" $MOUNTDIR/etc/lxdm/lxdm.conf
# remove some documentation to save space # remove some documentation to save space
for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do
find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \; find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \;

11
platforms/rootfs/post.inc.sh
View File

@ -44,17 +44,6 @@ TSLIB_CALIBFILE=/etc/pointercal
HOME=/root HOME=/root
_EOF _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 # configure favorites in kde menu
for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do 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 chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f

22
platforms/testcd-root/post.inc.sh
View File

@ -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 # FIXME: ensure alternatives are correclty set
chroot $MOUNTDIR update-alternatives-set-dri 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 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# remove kernel headers installed by dkms # remove kernel headers installed by dkms
chroot $MOUNTDIR smart remove kernel-${K}-headers -y 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 # 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 done
# remove some documentation to save space on CD # remove some documentation to save space on CD