Update

docker/01-runme.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 # Several packages need to be installed to use Dockerfile.py
 # It creates a local container that you can use to build minios-live
-apt install -y docker.io python3-pip
+apt install -y docker.io
 systemctl start docker
 systemctl enable docker
+apt install -y python3-pip
 pip3 install pydocker
 python3 ./Dockerfile.py

docker/02-build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #docker run -d --name mlc --privileged -v /build:/build local/mlc /build/slax/autoinstall -
-docker run --rm -it --privileged -v /build:/build local/mlc /build/slax/autoinstall -
+#docker run --rm -it --privileged -v /build:/build local/mlc /build/slax/autoinstall -
 #docker run --rm -it --privileged -v /build:/build local/mlc /build/slax/autoinstall build_modules_chroot -
-#docker run -it --name mlc --privileged -v /build:/build local/mlc
+docker run -it --name mlc --privileged -v /build:/build local/mlc
 #docker run -d --name mlc --privileged -v /build:/build local/mlc

docker/Dockerfile.py

@@ -12,7 +12,7 @@ logging.root.addHandler(logging.StreamHandler(sys.stdout))
 class DockerFile(pydocker.DockerFile):
     """   add here your custom features   """
 
-d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live-container:latest')
+d = DockerFile(base_img='ubuntu:focal', name='local/mlc:latest')
 #d = DockerFile(base_img='ubuntu:bionic', name='local/mlc:latest')
 #d = DockerFile(base_img='debian:buster', name='local/mlc:latest')
 
@@ -61,9 +61,9 @@ rm -f /var/lib/dpkg/*-old
 ''')
 
 d.VOLUME = '/build'
-d.WORKDIR = '/build/minios-live'
+d.WORKDIR = '/build/minios-slax'
 
 # d.ENTRYPOINT = ["/opt/www-data/entrypoint.sh"]
-d.CMD = ["/build/minios-live/autoinstall", "-"]
+d.CMD = ["/build/minios-slax/autoinstall", "-"]
 
 d.build_img()

linux-live/basesystem/01-core/install

@@ -6,6 +6,9 @@ set -u          # treat unset variable as error
 
 SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
 
+$APT_CMD update >>$OUTPUT 2>&1 &&
+    $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 linux-image-$KERNEL_ARCH >>$OUTPUT 2>&1
+
 # install packages
 if [ -f $SCRIPT_DIR/package.list ]; then
     #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \

linux-live/basesystem/01-core/package.list

@@ -1,10 +1,11 @@
 #sudo
-linux-image-amd64
+#linux-image-amd64
 #libterm-readline-gnu-perl
 #systemd-sysv
 #dbus
 #debconf-utils
 mc
+bash-completion
 squashfs-tools
 genisoimage
 zip
@@ -44,3 +45,5 @@ dvd+rw-tools
 usb-modeswitch
 pm-utils
 wget
+openssh-server
+open-vm-tools

linux-live/bootfiles/boot/EFI/Boot/syslinux.cfg

@@ -29,14 +29,14 @@ MENU TABMSG [F1] help                                                        [Ta
 LABEL default
 MENU LABEL Run MiniOS Slax (Persistent changes)
 KERNEL /minios/boot/vmlinuz
-APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 slax.flags=perch,automount net.ifnames=0 biosdevname=0
+APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 slax.flags=perch,automount net.ifnames=0 biosdevname=0 quiet
 
 LABEL live
 MENU LABEL Run MiniOS Slax (Fresh start)
 KERNEL /minios/boot/vmlinuz
-APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 slax.flags=automount net.ifnames=0 biosdevname=0
+APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 slax.flags=automount net.ifnames=0 biosdevname=0 quiet
 
 LABEL toram
 MENU LABEL Run MiniOS Slax (Copy to RAM)
 KERNEL /minios/boot/vmlinuz
-APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 slax.flags=toram net.ifnames=0 biosdevname=0
+APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 slax.flags=toram net.ifnames=0 biosdevname=0 quiet

linux-live/bootfiles/boot/bootinst.bat

@@ -7,12 +7,13 @@ COLOR 2F
 cls
 echo ===============================================================================
 echo.
-echo                            ________.__
+echo     ::::    ::::  ::::::::::: ::::    ::: ::::::::::: ::::::::   ::::::::  
-echo                           /   ____/^|  ^| _____  ___  ___
+echo     +:+:+: :+:+:+     :+:     :+:+:   :+:     :+:    :+:    :+: :+:    :+: 
-echo                           \____  \ ^|  ^| \__  \ \  \/  /
+echo     +:+ +:+:+ +:+     +:+     :+:+:+  +:+     +:+    +:+    +:+ +:+        
-echo                           /       \^|  ^|__/ __ \_^>    ^<
+echo     +#+  +:+  +#+     +#+     +#+ +:+ +#+     +#+    +#+    +:+ +#++:++#++ 
-echo                          /______  /^|____(____  /__/\_ \
+echo     +#+       +#+     +#+     +#+  +#+#+#     +#+    +#+    +#+        +#+ 
-echo                                 \/           \/      \/
+echo     #+#       #+#     #+#     #+#   #+#+#     #+#    #+#    #+# #+#    #+# 
+echo     ###       ### ########### ###    #### ########### ########   ########  
 echo.
 echo ===============================================================================
 echo.
@@ -53,18 +54,18 @@ if %OS% == Windows_NT goto setupNT
 goto setup95
 
 :setupNT
-\slax\boot\syslinux.exe -maf -d /slax/boot/ %DISK%:
+\minios\boot\syslinux.exe -maf -d /minios/boot/ %DISK%:
 if %ERRORLEVEL% == 0 goto setupEFI
 goto errorFound
 
 :setup95
-\slax\boot\syslinux.com -maf -d /slax/boot/ %DISK%:
+\minios\boot\syslinux.com -maf -d /minios/boot/ %DISK%:
 if %ERRORLEVEL% == 0 goto setupEFI
 goto errorFound
 
 :setupEFI
 mkdir %DISK%:\EFI\Boot
-copy \slax\boot\EFI\Boot\* %DISK%:\EFI\Boot
+copy \minios\boot\EFI\Boot\* %DISK%:\EFI\Boot
 goto setupDone
 
 :setupDone
@@ -80,7 +81,7 @@ goto pauseit
 :refuseDisk
 color 4F
 echo.
-echo Directory %DISK%:\slax\boot\ seems to be on the same physical disk as your Windows.
+echo Directory %DISK%:\minios\boot\ seems to be on the same physical disk as your Windows.
 echo Installing bootloader would harm your Windows and thus is disabled.
 echo Please use different drive and try again.
 goto pauseit

linux-live/bootfiles/boot/syslinux.cfg

@@ -29,14 +29,14 @@ MENU TABMSG [F1] help                                                        [Ta
 LABEL default
 MENU LABEL Run MiniOS Slax (Persistent changes)
 KERNEL /minios/boot/vmlinuz
-APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 minios.flags=perch net.ifnames=0 biosdevname=0
+APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 minios.flags=perch net.ifnames=0 biosdevname=0 quiet
 
-LABEL perch
+LABEL live
 MENU LABEL Run MiniOS Slax (Fresh start)
 KERNEL /minios/boot/vmlinuz
-APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 minios.flags= net.ifnames=0 biosdevname=0
+APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 minios.flags= net.ifnames=0 biosdevname=0 quiet
 
 LABEL toram
 MENU LABEL Run MiniOS Slax (Copy to RAM)
 KERNEL /minios/boot/vmlinuz
-APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 minios.flags=toram net.ifnames=0 biosdevname=0
+APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 minios.flags=toram net.ifnames=0 biosdevname=0 quiet

linux-live/build

@@ -1,93 +0,0 @@
-#!/bin/bash
-# Linux Live Kit version 7
-
-export PATH=.:./tools:../tools:/usr/sbin:/usr/bin:/sbin:/bin:/
-
-CHANGEDIR=$(dirname $(readlink -f $0))
-echo "Changing current directory to $CHANGEDIR"
-CWD="$(pwd)"
-cd $CHANGEDIR
-
-. ./config || exit 1
-. ./livekitlib || exit 1
-
-# only root can continue, because only root can read all files from your system
-allow_only_root
-
-# check for mksquashfs with xz compression
-if [ "$(mksquashfs 2>&1 | grep "Xdict-size")" = "" ]; then
-   echo "mksquashfs not found or doesn't support -comp xz, aborting, no changes made"
-   echo "you may consider installing squashfs-tools package"
-   exit 1
-fi
-
-MKISOFS=$(which mkisofs)
-if [ "$MKISOFS" = "" ]; then
-   MKISOFS=$(which genisoimage)
-fi
-if [ "$MKISOFS" = "" ]; then
-   echo "Cannot found mkisofs or genisoimage, stop"
-   exit 3
-fi
-
-# build initramfs image
-if [ "$SKIPINITRFS" = "" ]; then
-   echo "Building intramfs image..."
-   cd initramfs
-   INITRAMFS=$(./initramfs_create)
-   cd ..
-fi
-
-# create live kit filesystem (cpio archive)
-rm -Rf "$LIVEKITDATA"
-BOOT="$LIVEKITDATA"/"$LIVEKITNAME"/boot
-mkdir -p "$BOOT"
-mkdir -p "$BOOT"/../changes
-mkdir -p "$BOOT"/../modules
-
-if [ "$INITRAMFS" != "" ]; then
-   mv "$INITRAMFS" $BOOT/initrfs.img
-fi
-
-# BIOS / MBR booting
-cp -r bootfiles/* $BOOT
-cat bootfiles/syslinux.cfg | sed -r "s:/boot/:/$LIVEKITNAME/boot/:" > $BOOT/syslinux.cfg
-cat bootfiles/bootinst.bat | sed -r "s:/boot/:/$LIVEKITNAME/boot/:" | sed -r "s:\\\\boot\\\\:\\\\$LIVEKITNAME\\\\boot\\\\:" > $BOOT/bootinst.bat
-cp $VMLINUZ $BOOT/ || exit
-
-# UEFI booting
-mkdir -p $BOOT/EFI/Boot
-cp bootfiles/EFI/Boot/syslinux.efi $BOOT/EFI/Boot/bootx64.efi
-cp bootfiles/EFI/Boot/{ldlinux.e64,menu.c32,libutil.c32,vesamenu.c32,libcom32.c32} $BOOT/EFI/Boot
-cat $BOOT/syslinux.cfg | sed -r "s:/$LIVEKITNAME/boot/vesamenu:vesamenu:" > $BOOT/EFI/Boot/syslinux.cfg
-
-# create compressed 01-core.sb
-COREFS=""
-for i in $MKMOD; do
-   if [ -d /$i ]; then
-      COREFS="$COREFS /$i"
-   fi
-done
-mksquashfs $COREFS $LIVEKITDATA/$LIVEKITNAME/01-core.$BEXT -comp xz -b 1024K -always-use-fragments -keep-as-directory || exit
-
-cd "$LIVEKITDATA"
-ARCH=$(uname -m)
-TARGET=/tmp
-
-cat "$CWD/bootinfo.txt" | fgrep -v "#" | sed -r "s/mylinux/$LIVEKITNAME/" | sed -r "s/\$/\x0D/" > readme.txt
-
-echo cd $LIVEKITDATA '&&' $MKISOFS -o "$TARGET/$LIVEKITNAME-$ARCH.iso" -v -J -R -D -A "$LIVEKITNAME" -V "$LIVEKITNAME" \
--no-emul-boot -boot-info-table -boot-load-size 4 \
--b "$LIVEKITNAME"/boot/isolinux.bin -c "$LIVEKITNAME"/boot/isolinux.boot . \
-> $TARGET/gen_"$LIVEKITNAME"_iso.sh
-chmod o+x $TARGET/gen_"$LIVEKITNAME"_iso.sh
-
-echo cd $LIVEKITDATA '&&' zip -0 -r "$TARGET/$LIVEKITNAME-$ARCH.zip" '*' \
-> $TARGET/gen_"$LIVEKITNAME"_zip.sh
-chmod o+x $TARGET/gen_"$LIVEKITNAME"_zip.sh
-
-echo "-----------------------------"
-echo "Finished. Find your result in $LIVEKITDATA"
-echo "To build ISO, run: $TARGET/gen_"$LIVEKITNAME"_iso.sh"
-echo "To build ZIP, run: $TARGET/gen_"$LIVEKITNAME"_zip.sh"
-cd $CWD

linux-live/cleanup

@@ -1,91 +0,0 @@
-#!/bin/bash
-
-rm -f /etc/fstab
-rm -f /etc/mtab
-rm -f /etc/apt/sources.list~
-rm -Rf /etc/systemd/system/timers.target.wants
-rm -f /etc/systemd/system/multi-user.target.wants/ssh.service
-rm -f /etc/systemd/system/multi-user.target.wants/dnsmasq.service
-
-rm -f /etc/ssh/ssh_host*
-
-rm -f /var/backups/*
-rm -f /var/cache/ldconfig/*
-rm -f /var/cache/debconf/*
-rm -f /var/cache/fontconfig/*
-rm -f /var/lib/apt/extended_states
-rm -f /var/lib/systemd/random-seed
-rm -f /var/lib/apt/lists/deb.*
-rm -Rf /root/.local/share/mc
-rm -Rf /root/.cache
-rm -f /root/.wget-hsts
-
-rm -f /var/lib/dpkg/*-old
-rm -f /var/log/*
-rm -f /var/log/*/*
-rm -f /var/log/*/*/*
-rm -f /var/cache/apt/archives/*.deb
-rm -f /var/cache/apt/*.bin
-rm -f /var/cache/debconf/*-old
-rm -f /var/lib/dhcp/dhclient.leases
-rm -f /root/.bash_history
-rm -f /root/.wget-hsts
-rm -Rf /usr/share/doc/*
-rm -Rf /usr/share/info/*
-rm -f /usr/share/images/fluxbox/debian-squared.jpg
-rm -Rf /usr/share/fluxbox/nls/??*
-rm -Rf /usr/share/gnome/help
-
-rm -Rf /usr/share/locale/??
-rm -Rf /usr/share/locale/??_*
-rm -Rf /usr/share/locale/??@*
-rm -Rf /usr/share/locale/???
-rm -Rf /usr/share/i18n/locales/*_*
-rm -Rf /usr/share/man/??
-rm -Rf /usr/share/man/*_*
-
-rm -Rf /usr/share/icons/elementaryXubuntu-dark
-rm -Rf /usr/share/icons/gnome/256x256
-
-rm /usr/share/applications/compton.desktop
-rm /usr/share/applications/debian-uxterm.desktop
-rm /usr/share/applications/debian-xterm.desktop
-rm /usr/share/applications/htop.desktop
-rm /usr/share/applications/mc.desktop
-rm /usr/share/applications/mcedit.desktop
-rm /usr/share/applications/pcmanfm-desktop-pref.desktop
-rm /usr/share/applications/python2.7.desktop
-rm /usr/share/applications/python3.7.desktop
-rm /usr/share/applications/vim.desktop
-
-
-
-# Unzip gzipped files (man pages), so LZMA can compress 2times better.
-# First we fix symlinks, then uncompress files
-# $1 = search directory
-uncompress_files()
-{
-   local LINK LINE
-
-   find "$1" -type l -name "*.gz" | while read LINE; do
-      LINK="$(readlink "$LINE" | sed -r 's/.gz$//')"
-      FILE="$(echo "$LINE" | sed -r 's/.gz$//')"
-      ln -sfn "$LINK" "$FILE"
-      rm -f "$LINE"
-   done
-   find "$1" -type f -name "*.gz" | xargs -r gunzip
-}
-
-uncompress_files /etc/alternatives
-uncompress_files /usr/share/man
-
-# remove broken links
-# $1 = search directory
-remove_broken_links()
-{
-   find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf
-}
-
-remove_broken_links /etc/alternatives
-remove_broken_links /usr/share/man
-

linux-live/config

@@ -34,7 +34,7 @@ DISTRIBUTION_VARIANT="minbase"
 DISTRIBUTION_URL="http://ftp.ru.debian.org/debian/"
 
 #
-COMP_TYPE="lz4"
+COMP_TYPE="xz"
 
 # Kernel file, will be copied to your Live Kit
 # Your kernel must support aufs and squashfs. Debian Jessie's kernel is ready

linux-live/minioslib

@@ -28,6 +28,14 @@ function common_variables() {
 	if [[ (-f /.dockerenv || "$container" = "podman") && (-d /opt/minios-live || -f /.minios-live-container) ]]; then
 		CONTAINER_TYPE="2"
 	fi
+
+	if [ $DISTRIBUTION_ARCH = "amd64" ]; then
+		KERNEL_ARCH="amd64"
+	elif [ $DISTRIBUTION_ARCH = "i386" ]; then
+		KERNEL_ARCH="686-pae"
+	elif [ $DISTRIBUTION_ARCH = "arm64" ]; then
+		KERNEL_ARCH="arm64"
+	fi
 }
 
 # =================================================================
@@ -567,7 +575,7 @@ function copy_build_scripts() {
 		done
 	fi
 
-	chmod +x $BUILD_DIR/linux-live/build
+	#chmod +x $BUILD_DIR/linux-live/build
 	chmod +x $BUILD_DIR/linux-live/install_chroot
 
 	if [ "$DEV_SYSTEM" = "1" ]; then
@@ -675,7 +683,7 @@ function build_live() {
 	if [ $DISTRIBUTION != "buster" ]; then
 		cp $BUILD_DIR/boot/vmlinuz-**-**-generic $PARENT_DIR/image/$LIVEKITNAME/boot/vmlinuz
 	else
-		cp $BUILD_DIR/boot/vmlinuz-**-**-amd64 $PARENT_DIR/image/$LIVEKITNAME/boot/vmlinuz
+		cp $BUILD_DIR/boot/vmlinuz-**-**-$KERNEL_ARCH $PARENT_DIR/image/$LIVEKITNAME/boot/vmlinuz
 	fi
 	mv $BUILD_DIR/boot/initrfs.img $PARENT_DIR/image/$LIVEKITNAME/boot/initrfs.img
 
@@ -980,6 +988,7 @@ function main_pkg_list() {
 			APT_CMD=$APT_CMD \
 			APT_OPTIONS=$APT_OPTIONS \
 			APT_OPTIONS2=$APT_OPTIONS2 \
+			KERNEL_ARCH=$KERNEL_ARCH \
 			LIVE_TYPE=$LIVE_TYPE \
 			/linux-live/basesystem/01-core/install
 	fi
@@ -1081,6 +1090,7 @@ EOF
 
                            Thank you for using MiniOS.
                            Based on Debian GNU/Linux 10.
+                           Powered by Slax.
 
         ::::    ::::  ::::::::::: ::::    ::: ::::::::::: ::::::::   ::::::::  
         +:+:+: :+:+:+     :+:     :+:+:   :+:     :+:    :+:    :+: :+:    :+: 

linux-live/modules/02-xorg/package.list

@@ -12,3 +12,4 @@ xdotool
 libdrm-intel1
 libgl1-mesa-dri
 libglu1-mesa
+open-vm-tools-desktop

linux-live/modules/02-xorg/postinstall

@@ -9,7 +9,7 @@ chmod u+s /usr/lib/xorg/Xorg
 rm -Rf /usr/share/icons/breeze_cursors >>$OUTPUT 2>&1
 mv /usr/share/icons/Breeze_Snow /usr/share/icons/breeze_cursors >>$OUTPUT 2>&1
 
-(cd rootcopy && cp --parents -afr * /)
+(cd /rootcopy && cp --parents -afr * /)
 
 # install x11 server utils, apt-get would add cpp dependency, bullshit!
 cd /tmp

linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/menu

@@ -2,7 +2,7 @@
    [exec] (Terminal) { fbstartupnotify && xterm -ls }
    [exec] (File Manager) { fbstartupnotify && pcmanfm }
    [exec] (Web Browser) { fbstartupnotify && fbliveapp chromium }
-   [exec] (Text Editor) { fbstartupnotify && leafpad }
+   [exec] (Text Editor) { fbstartupnotify && medit }
    [exec] (Calculator) { fbstartupnotify && qalculate }
    [exec] (Network Manager) { fbstartupnotify && wicd-manager }
    [exec] (Run) { fbappselect }

linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/startup

@@ -18,11 +18,11 @@ gtk-bookmarks-update
 
 # Share common directories with guest user. This is necessary
 # because some apps like chromium must be running under guest
-for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do
+: 'for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do
    if ! mountpoint /root/$dir; then
       mount --bind /home/live/$dir /root/$dir
    fi
-done
+done'
 
 # set background color and big wait mouse cursor
 xsetroot -solid '#111111'

linux-live/modules/03-desktop/rootcopy/usr/bin/fbappselect

@@ -3,7 +3,7 @@
 COMMAND=$(
   xlunch_genquick 64 --desktop | \
   xlunch --border 7% --sideborder 10% --borderratio 100 --sideborderratio 50 \
-         --background /usr/share/wallpapers/slax_wallpaper.jpg --font DejaVuSans/11 \
+         --background /usr/share/wallpapers/slax_wallpaper.jpg --bgfill --font DejaVuSans/11 \
          --voidclickterminate --iconpadding 40 --textpadding 10 \
          --leastmargin 6 --hidemissing --iconsize 64 \
          --highlight /usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png \

linux-live/modules/03-desktop/rootcopy/usr/bin/fblogout

@@ -2,7 +2,7 @@
 
 COMMAND=$(
      xlunch --input /etc/xlunch/logout.dsv --noprompt --border auto --sideborder auto --columns 3 --rows 1 \
-            --background /usr/share/wallpapers/slax_wallpaper.jpg --font DejaVuSans/11 \
+            --background /usr/share/wallpapers/slax_wallpaper.jpg --bgfill --font DejaVuSans/11 \
             --voidclickterminate --iconpadding 30 --textpadding 10 \
             --leastmargin 10 --hidemissing --iconsize 128 \
             --highlight /usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png \

linux-live/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/theme.cfg

@@ -4,7 +4,7 @@
 ! common settings
 *font: Bitstream Vera Sans-9
 
-background:             fullscreen
+background:             aspect
 background.pixmap:      /usr/share/wallpapers/slax_wallpaper.jpg
 
 toolbar.justify:                     left

linux-live/modules/04-apps/install

@@ -6,6 +6,7 @@ echo "wicd-daemon	wicd/users	multiselect	live" | debconf-set-selections
 
 apt-get update >>$OUTPUT 2>&1
 apt-get install --no-install-recommends --yes \
+    medit \
     qalculate-gtk \
     pcmanfm \
     lxtask \

linux-live/modules/04-apps/install2

@@ -29,6 +29,7 @@ strip --strip-unneeded src/pcmanfm >>$OUTPUT 2>&1
 cp src/pcmanfm /squashfs-root/usr/bin >>$OUTPUT 2>&1
 
 rm -f /squashfs-root/usr/share/applications/leafpad.desktop >>$OUTPUT 2>&1
+rm -f /squashfs-root/usr/share/applications/medit.desktop >>$OUTPUT 2>&1
 rm -f /squashfs-root/usr/share/applications/qalculate-gtk.desktop >>$OUTPUT 2>&1
 rm -f /squashfs-root/usr/share/applications/pcmanfm.desktop >>$OUTPUT 2>&1
 rm -f /squashfs-root/usr/share/applications/wicd.desktop >>$OUTPUT 2>&1

linux-live/modules/04-apps/rootcopy/usr/share/applications/4medit.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Text editor
+Comment=Simple text editor
+Exec=medit %f
+Icon=medit
+Terminal=false
+Type=Application
+MimeType=text/plain
+Categories=GTK;Utility;TextEditor;
+Keywords=text;editor;
+InitialPreference=6

unused_modules/06-vlc/install

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e          # exit on error
+set -o pipefail # exit on pipeline error
+set -u          # treat unset variable as error
+
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+
+# install packages
+if [ -f $SCRIPT_DIR/package.list ]; then
+    #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
+    $APT_CMD update >>$OUTPUT 2>&1 &&
+        #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
+        $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
+            $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1
+fi
+
+rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1
+rm -Rf /usr/share/applications/vlc.desktop >>$OUTPUT 2>&1

unused_modules/06-vlc/package.list

@@ -0,0 +1 @@
+vlc