Changeset 6680

Timestamp:

Jan 25, 2018, 10:20:40 AM (2 years ago)

Author:

kbut

Message:

copy initrd and kernel. Remove lliurex-meta-live and configure openssh-server

File:

• lmd/trunk/fuentes/lmd-lliurex-data.install/usr/share/ltsp/plugins/ltsp-build-client/ISO/000-unsquash-iso (modified) (2 diffs)

lmd/trunk/fuentes/lmd-lliurex-data.install/usr/share/ltsp/plugins/ltsp-build-client/ISO/000-unsquash-iso

@@ -2 +2 @@
 case "$MODE" in 
         commandline)
-            add_option "isopath" "`eval_gettext "Set path for iso to uncompress"`" "advanced" "true"
+                        add_option "isopath" "`eval_gettext "Set path for iso to uncompress"`" "advanced" "true"
         ;;
         configure)
-            ISOPATH="$(echo $option_isopath_value)"
+                ISOPATH="$(echo $option_isopath_value)"
         ;;
         before-install)
         ;;
         install)
-            mkdir -p "/var/run/ltsp"
-            ISOTEMPPATH="$(mktemp -d -p /var/run/ltsp/)"
-            if [ -e "$ISOPATH" ]; then
-                    mount -o loop $ISOPATH $ISOTEMPPATH
-                    unsquashfs -d $ROOT -f "$ISOTEMPPATH/casper/filesystem.squashfs"
-                    umount $ISOTEMPPATH
-                    chroot $ROOT apt-get $APT_GET_OPTS update && echo si || { mv $ROOT/etc/apt/sources.list $ROOT/etc/apt/sources.list.old;}
-                    echo "deb http://lliurex.net/xenial xenial main restricted universe multiverse" >> $ROOT/etc/apt/sources.list.d/lliurex.temp.list
-                    echo "deb http://lliurex.net/xenial xenial-updates main restricted universe multiverse" >> $ROOT/etc/apt/sources.list.d/lliurex.temp.list
-                    echo "deb http://lliurex.net/xenial xenial-security main restricted universe multiverse" >> $ROOT/etc/apt/sources.list.d/lliurex.temp.list
-                    chroot $ROOT apt-get $APT_GET_OPTS update
-            else
-                echo "Error: $ISOPATH not exists"
-            fi
-            [ -d $ISOTEMPPATH ] && rm -r $ISOTEMPPATH
+                mkdir -p "/var/run/ltsp"
+                ISOTEMPPATH="$(mktemp -d -p /var/run/ltsp/)"
+                if [ -e "$ISOPATH" ]; then
+                        mount -o loop $ISOPATH $ISOTEMPPATH
+                        unsquashfs -d $ROOT -f "$ISOTEMPPATH/casper/filesystem.squashfs"
+                        VMLINUZ=$(basename `readlink -f $ROOT/vmlinuz`)
+                        INITRD=$(basename `readlink -f $ROOT/initrd.img`)
+
+                        cp "$ISOTEMPPATH/casper/$VMLINUZ" $ROOT/boot/
+                        ln -s "/boot/$VMLINUZ" $ROOT/boot/vmlinuz
+                        cp "$ISOTEMPPATH/casper/$INITRD" $ROOT/boot/
+                        ln -s "/boot/$INITRD" $ROOT/boot/initrd.img
+
+                        umount $ISOTEMPPATH
+                        set -e
+                        chroot $ROOT apt-get $APT_GET_OPTS update && echo si || { mv $ROOT/etc/apt/sources.list $ROOT/etc/apt/sources.list.old;}
+                        set +e
+                        echo "deb http://lliurex.net/xenial xenial main restricted universe multiverse" >> $ROOT/etc/apt/sources.list.d/lliurex.temp.list
+                        echo "deb http://lliurex.net/xenial xenial-updates main restricted universe multiverse" >> $ROOT/etc/apt/sources.list.d/lliurex.temp.list
+                        echo "deb http://lliurex.net/xenial xenial-security main restricted universe multiverse" >> $ROOT/etc/apt/sources.list.d/lliurex.temp.list
+                        chroot $ROOT apt-get $APT_GET_OPTS update
+                else
+                        echo "Error: $ISOPATH not exists"
+                fi
+                [ -d $ISOTEMPPATH ] && rm -r $ISOTEMPPATH
+                [ -e $ISOPATH ] && [[ "$ISOPATH" =~ ^/opt/ltsp/isos/* ]] && rm $ISOPATH
         ;;
         after-install)
@@ -30 +41 @@
         finalization)
                 rm $ROOT/etc/apt/sources.list.d/lliurex.temp.list
-                [ -e $ISOPATH ] && rm $ISOPATH
+                chroot $ROOT apt-get $APT_GET_OPTS purge lliurex-meta-live
+                chroot $ROOT dpkg-reconfigure openssh-server
+                
         ;;
 esac