Merge lp:~laga/ltsp/ltsp.karmic into lp:~stgraber/ltsp/ltsp.karmic

[laga]

[laga (laga)]

Hey,

the mythbuntu plugin needs an update. Please see this branch.

=== modified file 'debian/changelog'
--- debian/changelog	2009-08-17 04:40:58 +0000
+++ debian/changelog	2009-08-17 12:07:23 +0000
@@ -1,3 +1,13 @@
+ltsp (5.1.82-0ubuntu3) karmic; urgency=low
+
+  * Update debian/extra-plugins/030_mythbuntu:
+    - Remove --mythbuntu-copy-user-credentials as chpasswd does not
+      support encrypted passwords anymore
+    - Do not install linux-restricted-modules as it doesn't exist anymore
+    - Install mythbuntu-common 
+
+ -- Michael Haas <[e-mail]>  Mon, 17 Aug 2009 14:02:50 +0200
+
 ltsp (5.1.82-0ubuntu2) karmic; urgency=low
 
   * Start monitor_nbd with start-stop-daemon.

=== modified file 'debian/extra-plugins/030-mythbuntu'
--- debian/extra-plugins/030-mythbuntu	2009-02-09 18:58:17 +0000
+++ debian/extra-plugins/030-mythbuntu	2009-08-17 12:07:23 +0000
@@ -5,7 +5,6 @@
         # the plugin to use --kiosk kde for example to install kdm and konqueror
         # instead if we'd set it to true
         add_option "mythbuntu" "`eval_gettext "create a Mythbuntu fat client."`" "advanced" "false"
-        add_option "mythbuntu-copy-user-credentials" "`eval_gettext "Mythbuntu: copy login credentials from current user"`" "advanced" "false"
         add_option "mythbuntu-user-credentials" "`eval_gettext "Mythbuntu: specify login credentials as username:password"`" "advanced" "true"
     ;;
     
@@ -14,18 +13,11 @@
 if [ -n "$option_mythbuntu_value" ]; then
     # set an environment variable we can pick up later
     MYTHTV="True"
-    if [ -n "$option_mythbuntu_copy_user_credentials_value" ]; then
-        MBCRED="copy"
-    fi
     if [ -n "$option_mythbuntu_user_credentials_value" ]; then
-        if [ -n "$MBCRED" ]; then
-            echo "Only specify one of --mythbuntu-copy-user-credentials and --mythbuntu-user-credentials"
-            exit 100
-        fi
         MBCRED="$option_mythbuntu_user_credentials_value"
     fi
     if [ ! -n "$MBCRED" ]; then
-        echo "You must specify either --mythbuntu-copy-user-credentials or --mythbuntu-user-credentials!"
+        echo "You must specify --mythbuntu-user-credentials!"
         exit 100
     fi
 fi
@@ -54,38 +46,19 @@
     after-install)
         if [ -n "$MYTHTV" ]; then
             # install our mythbuntu stuff
-            LC_ALL=C chroot $ROOT apt-get $APT_GET_OPTS install mythbuntu-desktop mythtv-frontend mythplugins linux-restricted-modules xfce4-terminal
+            LC_ALL=C chroot $ROOT apt-get $APT_GET_OPTS install mythbuntu-desktop mythtv-frontend mythplugins xfce4-terminal mythbuntu-common
             # create directory
             mkdir -p $ROOT/etc/defaults/
+            
             # create a frontend user with sudo privileges
-            # do we want to allow $USER to be root?
-            if [ "$MBCRED" = "copy" ]; then
-                # $SUDO_USER is preferred over $USER
-                # Actually, in a sudo environment, $USER will be root 
-                # which we'd like to avoid
-                if [ -n "$SUDO_USER" ]; then
-                    MBUSER="$SUDO_USER"
-                else
-                    MBUSER="$USER"
-                fi
-
-                if [ -n "$MBUSER" ]; then
-                    MBSECRET=`grep $MBUSER /etc/shadow | cut -d : -f 2`
-                    MBENCRYPTED="-e" # for chpasswd: "Supplied passwords are in encrypted form."
-                else
-                    echo "Sorry, neither SUDO_USER nor USER  environment variable are set!"
-                    exit 101
-                fi
-            else
-                MBUSER=`echo $MBCRED | cut -d : -f 1`
-                MBSECRET=`echo $MBCRED | cut -d : -f 2`
-            fi
+            MBUSER=`echo $MBCRED | cut -d : -f 1`
+            MBSECRET=`echo $MBCRED | cut -d : -f 2`
 
             LC_ALL=C chroot $ROOT adduser --disabled-password --gecos ,,, $MBUSER
             LC_ALL=C chroot $ROOT usermod -a -G adm,admin,audio,operator,video,mythtv $MBUSER
         
             # set password
-            echo ${MBUSER}:${MBSECRET} |  LC_ALL=C chroot $ROOT chpasswd $MBENCRYPTED
+            echo ${MBUSER}:${MBSECRET} |  LC_ALL=C chroot $ROOT chpasswd
            
             # make sudo behave
             chmod u+w ${ROOT}/etc/sudoers
@@ -116,7 +89,7 @@
 EOF
 
         cat <<EOF >> $ROOT/etc/default/NetworkManager
-# mythbuntu-diskless does not need network-manager. it breaks the connection
+# mythbuntu-diskless does not need network-manager. it breaks the connectin
 # used to boot the client which is a very bad thing
 exit 0
 EOF