[Debian-live-changes] r1462 - in dists/trunk/live-initramfs: docs scripts/live-bottom

[Daniel Baumann]

Author: daniel
Date: 2007-05-11 14:01:44 +0000 (Fri, 11 May 2007)
New Revision: 1462

Added:
   dists/trunk/live-initramfs/scripts/live-bottom/11sudo
Modified:
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/scripts/live-bottom/10adduser
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-05-11 13:57:31 UTC (rev 1461)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-05-11 14:01:44 UTC (rev 1462)
@@ -4,6 +4,7 @@
 	  - Reformated.
 	* scripts/live-bottom/10adduser:
 	  - Moved screensaver hack to 22screensaver.
+	  - Moved sudo stuff to 11sudo.
 
 2007-05-09  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-initramfs/scripts/live-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-05-11 13:57:31 UTC (rev 1461)
+++ dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-05-11 14:01:44 UTC (rev 1462)
@@ -63,52 +63,22 @@
 set passwd/user-uid
 EOF
 
-if [ -f /root/etc/sudoers ]
+if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
 then
-	case "${BUILD_SYSTEM}" in
-		Debian)
-			echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
+	for FILE in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde/ubiquity-kdeui.desktop
+	do
+		if [ -f /root/${FILE} ]
+		then
+			chroot /root install -D -o ${USERNAME} -g ${USERNAME} ${FILE} /home/${USERNAME}/Desktop/`basename ${FILE}`
+			break
+		fi
+	done
 
-			chroot /root sudo -u "${USERNAME}" sh -c "echo 'SU_TO_ROOT_SU=sudo' >> /home/${USERNAME}/.su-to-rootrc"
-
-			chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/sudo-mode true
-			chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/display-no-pass-info false
-
-chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/config && cat > /home/${USERNAME}/.kde/share/config/kdesurc" << EOF
-[super-user-command]
-super-user-command=sudo
-EOF
-
-			if [ -f /root/usr/share/apps/konsole/sumc.desktop ]
-			then
-				chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo mc -c/' /usr/share/apps/konsole/sumc.desktop > /home/${USERNAME}/.kde/share/apps/konsole/sumc.desktop"
-			fi
-
-			if [ -f /root/usr/share/apps/konsole/su.desktop ]
-			then
-				chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo -i/' /usr/share/apps/konsole/su.desktop > /home/${USERNAME}/.kde/share/apps/konsole/su.desktop"
-			fi
-			;;
-
-		Ubuntu)
-			grep -q '^%admin' /root/etc/sudoers && sed -i -e '/^%admin/s/ALL$/NOPASSWD: ALL/' /root/etc/sudoers || echo '%admin  ALL=(ALL) NOPASSWD: ALL' >> /root/etc/sudoers
-
-			for FILE in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde/ubiquity-kdeui.desktop
-			do
-				if [ -f /root/${FILE} ]
-				then
-					chroot /root install -D -o ${USERNAME} -g ${USERNAME} ${FILE} /home/${USERNAME}/Desktop/`basename ${FILE}`
-					break
-				fi
-			done
-			;;
-	esac
+	if [ -L /root/home/${USERNAME}/Examples ]
+	then
+		chroot /root install -o ${USERNAME} -g ${USERNAME} -d /home/${USERNAME}/Desktop/
+		mv /root/home/${USERNAME}/Examples /root/home/${USERNAME}/Desktop/
+	fi
 fi
 
-if [ -L /root/home/${USERNAME}/Examples ]
-then
-	chroot /root install -o ${USERNAME} -g ${USERNAME} -d /home/${USERNAME}/Desktop/
-	mv /root/home/${USERNAME}/Examples /root/home/${USERNAME}/Desktop/
-fi
-
 log_end_msg

Added: dists/trunk/live-initramfs/scripts/live-bottom/11sudo
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/11sudo	2007-05-11 13:57:31 UTC (rev 1461)
+++ dists/trunk/live-initramfs/scripts/live-bottom/11sudo	2007-05-11 14:01:44 UTC (rev 1462)
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+set -e
+
+# initramfs-tools header
+
+PREREQ=""
+
+prereqs()
+{
+	echo "${PREREQ}"
+}
+
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Configuring sudo..."
+
+# sudo script
+
+if [ -f /root/etc/sudoers ]
+then
+	case "${BUILD_SYSTEM}" in
+		Debian)
+			echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
+
+			chroot /root sudo -u "${USERNAME}" sh -c "echo 'SU_TO_ROOT_SU=sudo' >> /home/${USERNAME}/.su-to-rootrc"
+
+			chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/sudo-mode true
+			chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/display-no-pass-info false
+
+chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/config && cat > /home/${USERNAME}/.kde/share/config/kdesurc" << EOF
+[super-user-command]
+super-user-command=sudo
+EOF
+
+			if [ -f /root/usr/share/apps/konsole/sumc.desktop ]
+			then
+				chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo mc -c/' /usr/share/apps/konsole/sumc.desktop > /home/${USERNAME}/.kde/share/apps/konsole/sumc.desktop"
+			fi
+
+			if [ -f /root/usr/share/apps/konsole/su.desktop ]
+			then
+				chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo -i/' /usr/share/apps/konsole/su.desktop > /home/${USERNAME}/.kde/share/apps/konsole/su.desktop"
+			fi
+			;;
+
+		Ubuntu)
+			grep -q '^%admin' /root/etc/sudoers && sed -i -e '/^%admin/s/ALL$/NOPASSWD: ALL/' /root/etc/sudoers || echo '%admin  ALL=(ALL) NOPASSWD: ALL' >> /root/etc/sudoers
+			;;
+	esac
+fi
+
+log_end_msg


Property changes on: dists/trunk/live-initramfs/scripts/live-bottom/11sudo
___________________________________________________________________
Name: svn:executable
   + *