Changeset 1205

Timestamp:

01/10/12 12:33:14 (4 months ago)

Author:

tschmitt

Message:

• linuxmuster-patch: stellt sicher, dass bei Wechsel des Imagingsystem mit --modify, die entsprechenchende Software installiert ist.

Location:

main/linuxmuster-base/trunk

Files:

• debian/changelog (modified) (1 diff)
• share/scripts/linuxmuster-patch (modified) (2 diffs)

main/linuxmuster-base/trunk/debian/changelog

@@ -6 +6 @@
       upgrade problems, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454557
       (closes #560).
-
- -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 10 Jan 2012 11:34:32 +0100
+  * linuxmuster-patch:
+    - ensures the right imaging task is installed if imaging is changed in modify mode.
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 10 Jan 2012 12:31:32 +0100
 
 linuxmuster-base (5.1.0-2lenny0) lenny; urgency=low

main/linuxmuster-base/trunk/share/scripts/linuxmuster-patch

@@ -29 +29 @@
 done
 
-# installs rembo
-if [ "$imaging" = "rembo" ]; then
-        echo 'DPkg::Options {"--force-confold";"--force-confdef";"--force-bad-verify";"--force-overwrite";};' > /etc/apt/apt.conf.d/99upgrade
-        task=`cat /usr/share/linuxmuster/tasks/imaging-$imaging`
-        export DEBIAN_FRONTEND=noninteractive
-        echo -n "Ja\nJa\n" | aptitude -y install $task | tee -a $LOGDIR/setup.log
-        rm /etc/apt/apt.conf.d/99upgrade
-fi
-
 # escaping special characters in passwords
 esc_spec_chars "$adminpw"
@@ -51 +42 @@
 adminpw_md5=`echo -n $adminpw | md5sum | cut -c -32`
 
-# reading old values
+# only in modify mode
 if [ "$1" != "--first" ]; then
-  echo "Checking for modified values ..."
-  . $OLDVALUES || exit 1
-  rm $OLDVALUES
+ # to be sure imaging packages are installed in case of imaging change
+ linuxmuster-task --unattended --install=imaging-$imaging
+
+ # reading old values
+ echo "Checking for modified values ..."
+ . $OLDVALUES || exit 1
+ rm $OLDVALUES
 fi