diff --git a/buildall b/buildall new file mode 100755 index 0000000..4f73fae --- /dev/null +++ b/buildall @@ -0,0 +1,88 @@ +#!/bin/bash + +SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" + +. $SCRIPT_DIR/linux-live/minioslib || exit 1 +. $SCRIPT_DIR/linux-live/config || exit 1 +if [ -z $OUTPUT ]; then + . $SCRIPT_DIR/linux-live/buildconfig || exit 1 +fi + +function build() { + sed -i -e "/DISTRIBUTION_TYPE=/s/=.*/=$DISTRIBUTION_TYPE/" $SCRIPT_DIR/linux-live/buildconfig + sed -i -e "/DISTRIBUTION=/s/=.*/=$DISTRIBUTION/" $SCRIPT_DIR/linux-live/buildconfig + sed -i -e "/DISTRIBUTION_ARCH=/s/=.*/=$DISTRIBUTION_ARCH/" $SCRIPT_DIR/linux-live/buildconfig + sed -i -e "/DESKTOP_ENVIRONMENT=/s/=.*/=$DESKTOP_ENVIRONMENT/" $SCRIPT_DIR/linux-live/buildconfig + sed -i -e "/COMP_TYPE=/s/=.*/=$COMP_TYPE/" $SCRIPT_DIR/linux-live/buildconfig + ./install - +} + +DISTRIBUTION_TYPE="debian" +DISTRIBUTION="bullseye" +DISTRIBUTION_ARCH="amd64" +DESKTOP_ENVIRONMENT="xfce" +COMP_TYPE="xz" +build + +DISTRIBUTION_TYPE="debian" +DISTRIBUTION="bullseye" +DISTRIBUTION_ARCH="i386" +DESKTOP_ENVIRONMENT="xfce" +COMP_TYPE="xz" +build + +DISTRIBUTION_TYPE="debian" +DISTRIBUTION="buster" +DISTRIBUTION_ARCH="amd64" +DESKTOP_ENVIRONMENT="xfce" +COMP_TYPE="xz" +build + +DISTRIBUTION_TYPE="debian" +DISTRIBUTION="buster" +DISTRIBUTION_ARCH="i386" +DESKTOP_ENVIRONMENT="slax" +COMP_TYPE="xz" +build + +DISTRIBUTION_TYPE="debian" +DISTRIBUTION="buster" +DISTRIBUTION_ARCH="amd64" +DESKTOP_ENVIRONMENT="slax" +COMP_TYPE="xz" +build + +DISTRIBUTION_TYPE="debian" +DISTRIBUTION="buster" +DISTRIBUTION_ARCH="i386" +DESKTOP_ENVIRONMENT="xfce" +COMP_TYPE="xz" +build + +DISTRIBUTION_TYPE="debian" +DISTRIBUTION="stretch" +DISTRIBUTION_ARCH="amd64" +DESKTOP_ENVIRONMENT="xfce" +COMP_TYPE="xz" +build + +DISTRIBUTION_TYPE="debian" +DISTRIBUTION="stretch" +DISTRIBUTION_ARCH="i386" +DESKTOP_ENVIRONMENT="xfce" +COMP_TYPE="xz" +build + +DISTRIBUTION_TYPE="ubuntu" +DISTRIBUTION="focal" +DISTRIBUTION_ARCH="amd64" +DESKTOP_ENVIRONMENT="xfce" +COMP_TYPE="xz" +build + +DISTRIBUTION_TYPE="ubuntu" +DISTRIBUTION="focal" +DISTRIBUTION_ARCH="i386" +DESKTOP_ENVIRONMENT="xfce" +COMP_TYPE="xz" +build \ No newline at end of file diff --git a/linux-live/bootfiles/boot/syslinux.cfg b/linux-live/bootfiles/boot/syslinux.cfg index ba2341a..7152057 100644 --- a/linux-live/bootfiles/boot/syslinux.cfg +++ b/linux-live/bootfiles/boot/syslinux.cfg @@ -1,7 +1,7 @@ UI /minios/boot/vesamenu.c32 PROMPT 0 -TIMEOUT 40 +TIMEOUT 30 MENU CLEAR MENU HIDDEN diff --git a/linux-live/buildconfig b/linux-live/buildconfig index ef549e3..6c38fe2 100644 --- a/linux-live/buildconfig +++ b/linux-live/buildconfig @@ -2,19 +2,23 @@ # distribution type # тип дистрибутива -DISTRIBUTION_TYPE="debian" +DISTRIBUTION_TYPE=debian # distribution # дистрибутив -DISTRIBUTION="buster" +DISTRIBUTION=bullseye # distribution arch # note: stretch only works with amd64 # архитектура дистрибутива # для заметки: stretch работает только с amd64 -DISTRIBUTION_ARCH="i386" +DISTRIBUTION_ARCH=i386 -COMP_TYPE="xz" +#DESKTOP_ENVIRONMENT=xfce +#DESKTOP_ENVIRONMENT=xfce +DESKTOP_ENVIRONMENT=xfce + +COMP_TYPE=xz # bootstrap variant (used to build Ubuntu) # вариант bootstrap (используется для сборки Ubuntu) @@ -62,9 +66,6 @@ APT_OPTIONS="-y" #LIVE_TYPE="casper" LIVE_TYPE="livekit" -#MODULES_TYPE="minios" -#MODULES_TYPE="slax" -MODULES_TYPE="minios" # тип iso BOOT_TYPE="hybrid" diff --git a/linux-live/initramfs/static/minios-configure b/linux-live/initramfs/static/minios-configure index ab9333e..6582e3c 100755 --- a/linux-live/initramfs/static/minios-configure +++ b/linux-live/initramfs/static/minios-configure @@ -92,6 +92,10 @@ function read_cmdline() { SSH=true shift # past argument with no value ;; + ssh_key=*) + SSH_KEY="${i#*=}" + shift # past argument=value + ;; cloud) CLOUD=true shift # past argument with no value @@ -200,6 +204,19 @@ else fi fi +if [ -z "$SSH_KEY" ]; then + if [ "$SCRIPT_DIR" != "/usr/bin" ]; then + if [ -f /etc/$LIVEKITNAME.conf ]; then + read_config /etc/$LIVEKITNAME.conf SSH_KEY + if [ -z "$SSH_KEY" ]; then + SSH_KEY="authorized_keys" + fi + else + SSH_KEY="authorized_keys" + fi + fi +fi + # Set up user 'root' if [ "$SCRIPT_DIR" != "/usr/bin" ]; then if [ ! -f /etc/$LIVEKITNAME.conf ]; then @@ -324,6 +341,13 @@ if [ ! -f /etc/$LIVEKITNAME.conf ]; then for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do mkdir -p /home/$USER_NAME/$dir done + if [ ! -d /home/$USER_NAME/.ssh ]; then + mkdir /home/$USER_NAME/.ssh + chmod 700 /home/$USER_NAME/.ssh + fi + if [ -f /root/.ssh/authorized_keys ]; then + cp /root/.ssh/authorized_keys /home/$USER_NAME/.ssh/authorized_keys + fi USER_ID=$(id -u $USER_NAME) GROUP_ID=$(id -g $USER_NAME) chown $USER_ID:$GROUP_ID /home/$USER_NAME @@ -373,7 +397,6 @@ if [ "$CLOUD" != "true" ]; then if [ ! -z "$USER_NAME" ]; then if [ "$USER_NAME" != "root" ]; then cat <>/etc/issue - Root login name: root Password: $ROOT_PASSWORD User login name: $USER_NAME @@ -386,7 +409,6 @@ if [ "$CLOUD" != "true" ]; then EOF else cat <>/etc/issue - Root login name: root Password: $ROOT_PASSWORD @@ -401,7 +423,6 @@ EOF fi else cat <>/etc/issue - User login name set by cloud-init. You must use your ssh key to login. @@ -428,7 +449,7 @@ ExecStop=-/bin/sh -c "if [ -f /run/initramfs/memory/data/$LIVEKITNAME/$LIVEKITNA [Install] WantedBy=multi-user.target EOF - +if [ -f /run/initramfs/memory/data/$LIVEKITNAME/$SSH_KEY ]; then if [ /etc/$LIVEKITNAME.conf -nt /run/initramfs/memory/data/$LIVEKITNAME/$LIVEKITNAME.conf ]; then cp -fp /etc/$LIVEKITNAME.conf /run/initramfs/memory/data/$LIVEKITNAME/$LIVEKITNAME.conf; fi; fi if [ ! -z "$USER_NAME" ]; then if [ -f /usr/lib/systemd/system/xorg.service ]; then cat </usr/lib/systemd/system/xorg.service @@ -515,6 +536,7 @@ ROOT_PASSWORD=$ROOT_PASSWORD HOST_NAME=$HOST_NAME DEFAULT_TARGET=$DEFAULT_TARGET SSH=$SSH +SSH_KEY=$SSH_KEY CLOUD=$CLOUD EOF else @@ -536,6 +558,9 @@ else if [ ! -z "$SSH" ]; then sed -i -e "/SSH=/s/=.*/=$SSH/" /etc/$LIVEKITNAME.conf fi + if [ ! -z "$SSH_KEY" ]; then + sed -i -e "/SSH_KEY=/s/=.*/=$SSH_KEY/" /etc/$LIVEKITNAME.conf + fi if [ ! -z "$CLOUD" ]; then sed -i -e "/CLOUD=/s/=.*/=$CLOUD/" /etc/$LIVEKITNAME.conf fi diff --git a/linux-live/livekitlib b/linux-live/livekitlib index 94b77a1..2bfd473 100644 --- a/linux-live/livekitlib +++ b/linux-live/livekitlib @@ -800,7 +800,8 @@ fstab_create() { minios_configure() { debug_log "minios_configure" "$*" - local WRITABLE + local WRITABLE SSH_KEY + SSH_KEY=$(cmdline_value ssh_key) cp /bin/minios-configure $1/ cat /proc/cmdline >$1/cmdline @@ -810,6 +811,9 @@ minios_configure() { if [ $? -ne 0 ]; then WRITABLE="false" #echo "* Directory $2/$LIVEKITNAME not writable" + if [ -z $SSH_KEY ]; then + SSH_KEY="authorized_keys" + fi else WRITABLE="true" if [ -d $2/$LIVEKITNAME ]; then @@ -824,15 +828,32 @@ minios_configure() { elif [ -f $1/etc/$LIVEKITNAME.conf ]; then cp -fp $1/etc/$LIVEKITNAME.conf $2/$LIVEKITNAME/$LIVEKITNAME.conf fi + if [ -z $SSH_KEY ]; then + SSH_KEY=$(config_value $1/etc/$LIVEKITNAME.conf SSH_KEY) + if [ -z $SSH_KEY ]; then + SSH_KEY="authorized_keys" + fi + fi + if [ ! -d $1/root/.ssh ]; then + mkdir $1/root/.ssh + chmod 700 $1/root/.ssh + fi + if [ -f $2/$LIVEKITNAME/$SSH_KEY ] && [ -f $1/root/.ssh/authorized_keys ]; then + if [ "$2/$LIVEKITNAME/$SSH_KEY" -nt "$1/root/.ssh/authorized_keys" ]; then + cp -fp $2/$LIVEKITNAME/$SSH_KEY $1/root/.ssh/authorized_keys + elif [ "$2/$LIVEKITNAME/$SSH_KEY" -ot "$1/root/.ssh/authorized_keys" ]; then + cp -fp $1/root/.ssh/authorized_keys $2/$LIVEKITNAME/$SSH_KEY + fi + elif [ -f $2/$LIVEKITNAME/$SSH_KEY ]; then + cp -fp $2/$LIVEKITNAME/$SSH_KEY $1/root/.ssh/authorized_keys + elif [ -f $1/root/.ssh/authorized_keys ]; then + cp -fp $1/root/.ssh/authorized_keys $2/$LIVEKITNAME/$SSH_KEY + fi fi fi echo "LIVEKITNAME=$LIVEKITNAME" >$1/livekit.conf - if grep -q minios_modules /proc/cmdline; then - cp /opt/minios-modules.tar.xz $1/minios-modules.tar.xz - fi - mkdir $1/var/log/minios chroot $1 /bin/bash -c "/minios-configure" >>/dev/null 2>&1 : 'chroot $1 /bin/bash <<'EOF' diff --git a/linux-live/minioslib b/linux-live/minioslib index edcba49..8895ed5 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -46,7 +46,7 @@ function common_variables() { KERNEL_ARCH="arm64" fi - if [ $MODULES_TYPE = "slax" ]; then + if [ $DESKTOP_ENVIRONMENT = "slax" ]; then PACKAGE_VARIANT="minimal" fi @@ -618,7 +618,7 @@ CREATE_BACKUP=$CREATE_BACKUP DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE APT_CMD=$APT_CMD APT_OPTIONS=$APT_OPTIONS -LIVE_TYPE=$LIVE_TYPE +DESKTOP_ENVIRONMENT=$DESKTOP_ENVIRONMENT DISTRIBUTION=$DISTRIBUTION DISTRIBUTION_TYPE=$DISTRIBUTION_TYPE PACKAGE_VARIANT=$PACKAGE_VARIANT @@ -759,8 +759,8 @@ function get_vars() { set +u add_chroot_configuration_files $1 . /functions - read_config /$LIVEKITNAME.conf OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH - export OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH + read_config /$LIVEKITNAME.conf OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS DESKTOP_ENVIRONMENT DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH + export OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS DESKTOP_ENVIRONMENT DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH set -u } @@ -769,8 +769,8 @@ function chroot_run() { add_chroot_configuration_files $1 chroot $1 /bin/bash <>$OUTPUT 2>&1 + rm $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DESKTOP_ENVIRONMENT-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-*.iso >>$OUTPUT 2>&1 while [ -f $ISO_DIR/$LIVEKITNAME.iso ]; do rm $ISO_DIR/$LIVEKITNAME.iso >>$OUTPUT 2>&1 sleep 1 @@ -1311,7 +1311,7 @@ function build_iso() { rm $ISO_DIR/$LIVEKITNAME.iso >>$OUTPUT 2>&1 sleep 1 done - if ln $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then + if ln $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DESKTOP_ENVIRONMENT-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then echo ">>> $ISO_DIR/$LIVEKITNAME.iso created" fi fi @@ -1577,7 +1577,7 @@ DISTRIBUTION_TYPE="$DISTRIBUTION_TYPE" DISTRIBUTION="$DISTRIBUTION" DISTRIBUTION_ARCH="$DISTRIBUTION_ARCH" PACKAGE_VARIANT="$PACKAGE_VARIANT" -LIVE_TYPE="livekit" +DESKTOP_ENVIRONMENT="livekit" OUTPUT="/dev/stdout" # Default is output to /dev/stdout. You can use OUTPUT="/dev/null" if you want to silent installation or OUTPUT="somefilename.log" to route events to log file. DEBIAN_FRONTEND_TYPE="noninteractive" APT_CMD="apt-get" @@ -2071,7 +2071,7 @@ function build_modules() { MODULES_DIR=$BUILD_DIR/modules - cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE + cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT for MODULE in *; do if (ls $BUILD_DIR/image/$LIVEKITNAME/*.$BEXT | grep -q $MODULE 2>/dev/null); then @@ -2094,52 +2094,52 @@ function build_modules() { #fi # run pre-install script - if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/preinstall ]; then + if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/preinstall ]; then if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then - cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall + cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall chmod +x $MODULE_MERGED_DIR/preinstall chroot_run $MODULE_MERGED_DIR /preinstall else - cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall + cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall chmod +x $MODULE_MERGED_DIR/preinstall chroot_run $MODULE_MERGED_DIR /preinstall >>$OUTPUT 2>&1 fi fi # copy files - if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then + if [ ! -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install)" != "" ]; then - (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/) + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install)" != "" ]; then + (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/) fi else - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then - (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/) + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then + (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/) fi fi else if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install)" != "" ]; then + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install)" != "" ]; then mkdir $MODULE_MERGED_DIR/rootcopy-install - (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/) + (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/) fi else - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then mkdir $MODULE_MERGED_DIR/rootcopy-install - (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/) + (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/) fi fi fi # run install script - if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/install ]; then - cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/install $MODULE_MERGED_DIR/install + if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/install ]; then + cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/install $MODULE_MERGED_DIR/install chmod +x $MODULE_MERGED_DIR/install - if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/cleanup ]; then - cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/cleanup $MODULE_MERGED_DIR/cleanup + if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/cleanup ]; then + cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/cleanup $MODULE_MERGED_DIR/cleanup fi - if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/$PACKAGE_VARIANT.list ]; then - cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/$PACKAGE_VARIANT.list $MODULE_MERGED_DIR/$PACKAGE_VARIANT.list + if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/$PACKAGE_VARIANT.list ]; then + cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/$PACKAGE_VARIANT.list $MODULE_MERGED_DIR/$PACKAGE_VARIANT.list fi if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then chroot_run $MODULE_MERGED_DIR /install @@ -2148,7 +2148,7 @@ function build_modules() { fi fi - if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then + if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then module_chroot_umount_fs module_build_cleanup @@ -2171,12 +2171,12 @@ function build_modules() { fi # run install2 script - if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/install2 ]; then - cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/install2 $MODULE_MERGED_DIR/install2 + if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/install2 ]; then + cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/install2 $MODULE_MERGED_DIR/install2 chmod +x $MODULE_MERGED_DIR/install2 - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/patches)" != "" ] >>$OUTPUT 2>&1; then + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/patches)" != "" ] >>$OUTPUT 2>&1; then mkdir $MODULE_MERGED_DIR/patches - (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/patches && cp --parents -afr * $MODULE_MERGED_DIR/patches/) + (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/patches && cp --parents -afr * $MODULE_MERGED_DIR/patches/) fi if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then chroot_run $MODULE_MERGED_DIR /install2 @@ -2186,33 +2186,33 @@ function build_modules() { fi # copy files - if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then + if [ ! -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall)" != "" ]; then - (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/) + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall)" != "" ]; then + (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/) fi else - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then - (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/) + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then + (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/) fi fi else if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall)" != "" ]; then + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall)" != "" ]; then mkdir $MODULE_MERGED_DIR/rootcopy-postinstall - (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/) + (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/) fi else - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then mkdir $MODULE_MERGED_DIR/rootcopy-postinstall - (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/) + (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/) fi fi fi # run post-install script - if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/postinstall ]; then - cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/postinstall $MODULE_MERGED_DIR/postinstall + if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/postinstall ]; then + cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/postinstall $MODULE_MERGED_DIR/postinstall chmod +x $MODULE_MERGED_DIR/postinstall if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then chroot_run $MODULE_MERGED_DIR /postinstall @@ -2221,7 +2221,7 @@ function build_modules() { fi fi - if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then + if [ ! -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then set +e chroot_run $MODULE_MERGED_DIR uncompress_files /etc/alternatives chroot_run $MODULE_MERGED_DIR uncompress_files /usr/share/man @@ -2231,7 +2231,7 @@ function build_modules() { fi # run external actions - if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then + if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then cp $MODULE_UPPER_DIR/$MODULE.$BEXT $BUILD_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT >>$OUTPUT 2>&1 fi @@ -2239,13 +2239,13 @@ function build_modules() { module_chroot_umount_fs - if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then + if [ ! -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then module_build_cleanup fi module_chroot_cleanup - if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then + if [ ! -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then if [ ! -f $BUILD_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT ]; then if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then if [ $COMP_TYPE = "zstd" ]; then @@ -2283,7 +2283,7 @@ function build_modules_live() { MODULES_DIR=$BUILD_DIR/modules - cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE + cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT for MODULE in *; do diff --git a/linux-live/modules/cinnamon/01-firmware b/linux-live/modules/cinnamon/01-firmware new file mode 120000 index 0000000..23377da --- /dev/null +++ b/linux-live/modules/cinnamon/01-firmware @@ -0,0 +1 @@ +../xfce/01-firmware \ No newline at end of file diff --git a/linux-live/modules/cinnamon/02-xorg b/linux-live/modules/cinnamon/02-xorg new file mode 120000 index 0000000..055971c --- /dev/null +++ b/linux-live/modules/cinnamon/02-xorg @@ -0,0 +1 @@ +../xfce/02-xorg \ No newline at end of file diff --git a/linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.cinnamon/configs/menu@cinnamon.org/0.json b/linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.cinnamon/configs/menu@cinnamon.org/0.json new file mode 100644 index 0000000..0d68ace --- /dev/null +++ b/linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.cinnamon/configs/menu@cinnamon.org/0.json @@ -0,0 +1,258 @@ +{ + "layout": { + "type": "layout", + "pages": [ + "panel", + "menu" + ], + "panel": { + "type": "page", + "title": "Panel", + "sections": [ + "panel-appear", + "panel-behave" + ] + }, + "menu": { + "type": "page", + "title": "Menu", + "sections": [ + "menu-layout", + "menu-behave" + ] + }, + "panel-appear": { + "type": "section", + "title": "Appearance", + "keys": [ + "menu-custom", + "menu-icon", + "menu-icon-size", + "menu-label" + ] + }, + "panel-behave": { + "type": "section", + "title": "Behavior", + "keys": [ + "overlay-key", + "activate-on-hover", + "hover-delay", + "force-show-panel", + "enable-animation" + ] + }, + "menu-layout": { + "type": "section", + "title": "Layout and content", + "keys": [ + "show-category-icons", + "category-icon-size", + "show-application-icons", + "application-icon-size", + "favbox-show", + "fav-icon-size", + "favbox-min-height", + "show-places", + "show-recents", + "menu-editor-button" + ] + }, + "menu-behave": { + "type": "section", + "title": "Behavior", + "keys": [ + "enable-autoscroll", + "search-filesystem" + ] + } + }, + "overlay-key": { + "type": "keybinding", + "description": "Keyboard shortcut to open and close the menu", + "default": "Super_L::Super_R", + "value": "Super_L::Super_R" + }, + "menu-custom": { + "type": "switch", + "default": false, + "description": "Use a custom icon and label", + "tooltip": "Check this to specify a custom icon and label", + "value": true + }, + "menu-icon": { + "type": "iconfilechooser", + "default": "cinnamon-symbolic", + "description": "Icon", + "tooltip": "Select an icon to show in the panel.", + "default_icon": "cinnamon-symbolic", + "dependency": "menu-custom", + "indent": true, + "value": "/usr/share/pixmaps/MiniOS-white.svg" + }, + "menu-icon-size": { + "type": "spinbutton", + "default": 32, + "min": 16, + "max": 96, + "step": 1, + "units": "px", + "description": "Icon size", + "dependency": "menu-custom", + "indent": true, + "value": 32 + }, + "menu-label": { + "type": "entry", + "default": "Menu", + "description": "Text", + "tooltip": "Enter custom text to show in the panel.", + "dependency": "menu-custom", + "indent": true, + "value": "" + }, + "favbox-min-height": { + "type": "spinbutton", + "default": 300, + "min": 50, + "max": 1000, + "step": 10, + "units": "px", + "dependency": "favbox-show", + "description": "Minimum height of the favorites section", + "tooltip": "The minimum size allocated for the favorites section (this has an impact on the overall height of the menu).", + "value": 300 + }, + "show-category-icons": { + "type": "switch", + "default": true, + "description": "Show category icons", + "tooltip": "Choose whether or not to show icons on categories.", + "value": true + }, + "category-icon-size": { + "type": "spinbutton", + "default": 22, + "min": 16, + "max": 48, + "step": 1, + "units": "px", + "description": "Categories icon size", + "dependency": "show-category-icons", + "indent": true, + "value": 22 + }, + "show-application-icons": { + "type": "switch", + "default": true, + "description": "Show application icons", + "tooltip": "Choose whether or not to show icons on applications.", + "value": true + }, + "application-icon-size": { + "type": "spinbutton", + "default": 22, + "min": 16, + "max": 48, + "step": 1, + "units": "px", + "description": "Applications icon size", + "dependency": "show-application-icons", + "indent": true, + "value": 22 + }, + "favbox-show": { + "type": "switch", + "default": true, + "description": "Show favorites and session buttons", + "tooltip": "Choose whether or not to show the left pane of the menu.", + "value": true + }, + "fav-icon-size": { + "type": "spinbutton", + "default": 32, + "min": 16, + "max": 64, + "step": 1, + "units": "px", + "description": "Favorites icon size", + "dependency": "favbox-show", + "indent": true, + "value": 32 + }, + "show-favorites": { + "type": "switch", + "default": true, + "description": "Show favorites", + "tooltip": "Choose whether or not to show favorite files in the menu.", + "value": true + }, + "show-places": { + "type": "switch", + "default": true, + "description": "Show bookmarks and places", + "tooltip": "Choose whether or not to show bookmarks and places in the menu.", + "value": true + }, + "show-recents": { + "type": "switch", + "default": true, + "description": "Show recents", + "tooltip": "Choose whether or not to show recents in the menu.", + "value": true + }, + "enable-autoscroll": { + "type": "switch", + "default": true, + "description": "Enable autoscrolling in application list", + "tooltip": "Choose whether or not to enable smooth autoscrolling in the application list.", + "value": true + }, + "search-filesystem": { + "type": "switch", + "default": false, + "description": "Enable filesystem path entry in search box", + "tooltip": "Allows path entry in the menu search box.", + "value": false + }, + "force-show-panel": { + "type": "switch", + "default": true, + "description": "Force the panel to be visible when opening the menu", + "tooltip": "Opening the menu will also show the main panel (which may be auto-hidden).", + "value": true + }, + "activate-on-hover": { + "type": "switch", + "default": false, + "description": "Open the menu when I move my mouse over it", + "tooltip": "Enable opening the menu when the mouse enters the applet", + "value": false + }, + "hover-delay": { + "type": "spinbutton", + "default": 0, + "min": 0, + "max": 1000, + "step": 50, + "units": "milliseconds", + "dependency": "activate-on-hover", + "description": "Menu hover delay", + "tooltip": "Delay before the menu opens when hovered", + "value": 0 + }, + "enable-animation": { + "type": "switch", + "default": false, + "description": "Use menu animations", + "tooltip": "Allow the menu to animate on open and close", + "value": false + }, + "menu-editor-button": { + "type": "button", + "description": "Open the menu editor", + "callback": "_launch_editor", + "tooltip": "Press this button to customize your menu entries." + }, + "__md5__": "c4b27da93411965126569249b61793d7" +} \ No newline at end of file diff --git a/linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.config/dconf/user b/linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.config/dconf/user new file mode 100644 index 0000000..92155e0 Binary files /dev/null and b/linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.config/dconf/user differ diff --git a/linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.xinitrc b/linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.xinitrc new file mode 100644 index 0000000..e741276 --- /dev/null +++ b/linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.xinitrc @@ -0,0 +1,16 @@ +#!/bin/sh +# +# ~/.xinitrc +# +# Executed by startx (run your window manager from here) + +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for f in /etc/X11/xinit/xinitrc.d/*; do + [ -x "$f" ] && . "$f" + done + unset f +fi + +xrdb -merge .Xresources + +exec cinnamon-session \ No newline at end of file diff --git a/linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.xsession b/linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.xsession new file mode 100644 index 0000000..1b09cae --- /dev/null +++ b/linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.xsession @@ -0,0 +1 @@ +cinnamon-session \ No newline at end of file diff --git a/linux-live/modules/cinnamon/03-cinnamon-desktop/install b/linux-live/modules/cinnamon/03-cinnamon-desktop/install new file mode 100644 index 0000000..31112b5 --- /dev/null +++ b/linux-live/modules/cinnamon/03-cinnamon-desktop/install @@ -0,0 +1,137 @@ +#!/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")")" + +echo "nodm nodm/enabled boolean true" | debconf-set-selections +echo "samba-common samba-common/dhcp boolean false" | debconf-set-selections + +# install packages +if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then + $APT_CMD update >>$OUTPUT 2>&1 && + $APT_CMD install $APT_OPTIONS \ + $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 +fi + +if grep slim $SCRIPT_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1; then + sed -i 's,# hidecursor false,hidecursor false,g' /etc/slim.conf + sed -i 's,screenshot_cmd scrot /root/slim.png,# screenshot_cmd scrot /root/slim.png,g' /etc/slim.conf + if [ $PACKAGE_VARIANT = "minimal" ]; then + sed -i 's,#default_user simone,default_user root,g' /etc/slim.conf + else + sed -i 's,#default_user simone,default_user live,g' /etc/slim.conf + fi + sed -i 's,#auto_login no,auto_login yes,g' /etc/slim.conf + sed -i 's,current_theme debian-softwaves,current_theme minios,g' /etc/slim.conf +fi + +update-alternatives --install /usr/share/images/desktop-base/desktop-background desktop-background /usr/share/backgrounds/MiniOS-wallpaper.svg 100 + + cat <>/usr/share/applications/htop.desktop +[Desktop Entry] +Type=Application +Version=1.0 +Name=Htop +GenericName=Process Viewer +GenericName[ca]=Visualitzador de processos +GenericName[da]=Procesfremviser +GenericName[de]=Prozessanzeige +GenericName[en_GB]=Process Viewer +GenericName[es]=Visor de procesos +GenericName[fi]=Prosessikatselin +GenericName[fr]=Visualiseur de processus +GenericName[gl]=Visor de procesos +GenericName[it]=Visore dei processi +GenericName[ko]=프로세스 뷰어 +GenericName[nb]=Prosessviser +GenericName[nl]=Viewer van processen +GenericName[nn]=Prosessvisar +GenericName[pl]=Przeglądarka procesów +GenericName[pt]=Visualizador de Processos +GenericName[pt_BR]=Visualizador de processos +GenericName[ru]=Монитор процессов +GenericName[sk]=Prehliadač procesov +GenericName[sl]=Pregledovalnik opravil +GenericName[sr@ijekavian]=Приказивач процеса +GenericName[sr@ijekavianlatin]=Prikazivač procesa +GenericName[sr@latin]=Prikazivač procesa +GenericName[sr]=Приказивач процеса +GenericName[sv]=Processvisning +GenericName[tr]=Süreç Görüntüleyici +GenericName[uk]=Перегляд процесів +GenericName[zh_CN]=进程查看器 +GenericName[zh_TW]=行程檢視器 +Comment=Show System Processes +Comment[ca]=Visualitzeu els processos del sistema +Comment[da]=Vis systemprocesser +Comment[de]=Systemprozesse anzeigen +Comment[en_GB]=Show System Processes +Comment[es]=Mostrar procesos del sistema +Comment[fi]=Katsele järjestelmän prosesseja +Comment[fr]=Affiche les processus système +Comment[gl]=Mostrar os procesos do sistema. +Comment[it]=Mostra processi di sistema +Comment[ko]=시스템 프로세스 보기 +Comment[nb]=Vis systemprosesser +Comment[nl]=Systeemprocessen tonen +Comment[nn]=Vis systemprosessar +Comment[pl]=Pokaż procesy systemowe +Comment[pt]=Mostrar os Processos do Sistema +Comment[pt_BR]=Mostra os processos do sistema +Comment[ru]=Просмотр списка процессов в системе +Comment[sk]=Zobraziť systémové procesy +Comment[sl]=Prikaz sistemskih opravil +Comment[sr@ijekavian]=Приказ системских процеса +Comment[sr@ijekavianlatin]=Prikaz sistemskih procesa +Comment[sr@latin]=Prikaz sistemskih procesa +Comment[sr]=Приказ системских процеса +Comment[sv]=Visa systemprocesser +Comment[tr]=Sistem Süreçlerini Göster +Comment[uk]=Перегляд системних процесів +Comment[zh_CN]=显示系统进程 +Comment[zh_TW]=顯示系統行程 +Icon=htop +Exec=htop +Terminal=true +Categories=System;Monitor;ConsoleOnly; +Keywords=system;process;task +EOF + cat <>/usr/share/applications/mc.desktop +[Desktop Entry] +Name=Midnight Commander +Name[af]=Middernag Kommandeur +Name[eo]=Meznokta komandanto +Name[fa]=فرمان‌دار نیمه شب +Name[ko]=미드나잇 커멘더 +Name[lv]=Pusnakts Komandieris +Name[nso]=Molaedi wa Bosegogare +Name[th]=มิดไนท์คอมมานเดอร์ +Name[ve]=Muhulwane wa vhukati ha vhusiku +Name[xh]=Umyaleli Waphakathi kobusuku +Name[zu]=Umyaleli waphakathi nobusuku +Comment=File manager +Comment[pl]=Menedżer plików +Exec=mc +Icon=file-manager.png +Terminal=true +Type=Application +Categories=ConsoleOnly;Utility;FileManager;System;FileTools; +Keywords=file manager;console; +EOF + cat <>/usr/share/applications/debian-xterm.desktop +[Desktop Entry] +Name=XTerm +#GenericName=Terminal +Comment=standard terminal emulator for the X window system +Exec=xterm +Terminal=false +Type=Application +#Encoding=UTF-8 +Icon=Terminal +Categories=System;TerminalEmulator; +Keywords=shell;prompt;command;commandline;cmd; +X-Desktop-File-Install-Version=0.26 +EOF diff --git a/linux-live/modules/minios/05-firefox/postinstall b/linux-live/modules/cinnamon/03-cinnamon-desktop/postinstall similarity index 100% rename from linux-live/modules/minios/05-firefox/postinstall rename to linux-live/modules/cinnamon/03-cinnamon-desktop/postinstall diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg rename to linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg rename to linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png rename to linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png rename to linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme rename to linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme diff --git a/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/debian-xterm.desktop b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/debian-xterm.desktop new file mode 100644 index 0000000..94836b9 --- /dev/null +++ b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/debian-xterm.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=XTerm +#GenericName=Terminal +Comment=standard terminal emulator for the X window system +Exec=xterm +Terminal=false +Type=Application +#Encoding=UTF-8 +Icon=xterm +Categories=System;TerminalEmulator; +Keywords=shell;prompt;command;commandline;cmd; +X-Desktop-File-Install-Version=0.26 diff --git a/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/htop.desktop b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/htop.desktop new file mode 100644 index 0000000..ebdeed0 --- /dev/null +++ b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/htop.desktop @@ -0,0 +1,67 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Htop +GenericName=Process Viewer +GenericName[ca]=Visualitzador de processos +GenericName[da]=Procesfremviser +GenericName[de]=Prozessanzeige +GenericName[en_GB]=Process Viewer +GenericName[es]=Visor de procesos +GenericName[fi]=Prosessikatselin +GenericName[fr]=Visualiseur de processus +GenericName[gl]=Visor de procesos +GenericName[it]=Visore dei processi +GenericName[ko]=프로세스 뷰어 +GenericName[nb]=Prosessviser +GenericName[nl]=Viewer van processen +GenericName[nn]=Prosessvisar +GenericName[pl]=Przeglądarka procesów +GenericName[pt]=Visualizador de Processos +GenericName[pt_BR]=Visualizador de processos +GenericName[ru]=Монитор процессов +GenericName[sk]=Prehliadač procesov +GenericName[sl]=Pregledovalnik opravil +GenericName[sr@ijekavian]=Приказивач процеса +GenericName[sr@ijekavianlatin]=Prikazivač procesa +GenericName[sr@latin]=Prikazivač procesa +GenericName[sr]=Приказивач процеса +GenericName[sv]=Processvisning +GenericName[tr]=Süreç Görüntüleyici +GenericName[uk]=Перегляд процесів +GenericName[zh_CN]=进程查看器 +GenericName[zh_TW]=行程檢視器 +Comment=Show System Processes +Comment[ca]=Visualitzeu els processos del sistema +Comment[da]=Vis systemprocesser +Comment[de]=Systemprozesse anzeigen +Comment[en_GB]=Show System Processes +Comment[es]=Mostrar procesos del sistema +Comment[fi]=Katsele järjestelmän prosesseja +Comment[fr]=Affiche les processus système +Comment[gl]=Mostrar os procesos do sistema. +Comment[it]=Mostra processi di sistema +Comment[ko]=시스템 프로세스 보기 +Comment[nb]=Vis systemprosesser +Comment[nl]=Systeemprocessen tonen +Comment[nn]=Vis systemprosessar +Comment[pl]=Pokaż procesy systemowe +Comment[pt]=Mostrar os Processos do Sistema +Comment[pt_BR]=Mostra os processos do sistema +Comment[ru]=Просмотр списка процессов в системе +Comment[sk]=Zobraziť systémové procesy +Comment[sl]=Prikaz sistemskih opravil +Comment[sr@ijekavian]=Приказ системских процеса +Comment[sr@ijekavianlatin]=Prikaz sistemskih procesa +Comment[sr@latin]=Prikaz sistemskih procesa +Comment[sr]=Приказ системских процеса +Comment[sv]=Visa systemprocesser +Comment[tr]=Sistem Süreçlerini Göster +Comment[uk]=Перегляд системних процесів +Comment[zh_CN]=显示系统进程 +Comment[zh_TW]=顯示系統行程 +Icon=utilities-system-monitor +Exec=htop +Terminal=true +Categories=System;Monitor;ConsoleOnly; +Keywords=system;process;task diff --git a/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/mc.desktop b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/mc.desktop new file mode 100644 index 0000000..2027318 --- /dev/null +++ b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/mc.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Name=Midnight Commander +Name[af]=Middernag Kommandeur +Name[eo]=Meznokta komandanto +Name[fa]=فرمان‌دار نیمه شب +Name[ko]=미드나잇 커멘더 +Name[lv]=Pusnakts Komandieris +Name[nso]=Molaedi wa Bosegogare +Name[th]=มิดไนท์คอมมานเดอร์ +Name[ve]=Muhulwane wa vhukati ha vhusiku +Name[xh]=Umyaleli Waphakathi kobusuku +Name[zu]=Umyaleli waphakathi nobusuku +Comment=File manager +Comment[pl]=Menedżer plików +Exec=mc +Icon=file-manager.png +Terminal=true +Type=Application +Categories=ConsoleOnly;Utility;FileManager;System;FileTools; +Keywords=file manager;console; diff --git a/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/ncdu.desktop b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/ncdu.desktop new file mode 100644 index 0000000..6ab9888 --- /dev/null +++ b/linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/ncdu.desktop @@ -0,0 +1,179 @@ +[Desktop Entry] +Name[af]=Skyfgebruik +Name[an]=Analizador d'uso de disco +Name[ar]=محلّل استخدام القرص +Name[as]=ডিস্ক ব্যৱহাৰ বিশ্লেষক +Name[ast]=Analizador d'Usu de Discu +Name[be]=Аналіз дыскавай прасторы +Name[be@latin]=Analizatar zaniataści dyskavaj prastory +Name[bg]=Анализатор на ползването на диска +Name[bn]=ডিস্ক ব্যবহারের বিশ্লেষণ ব্যবস্থা +Name[bn_IN]=ডিস্ক ব্যবহারের বিশ্লেষণ ব্যবস্থা +Name[br]=Dezranner arver ar c'hantennoù +Name[bs]=Alat za analizu upotrebe diska +Name[ca]=Analitzador de l'ús dels discs +Name[ca@valencia]=Analitzador de l'ús dels discs +Name[crh]=Disk Qullanımı Tahlilcisi +Name[cs]=Analyzátor využití disku +Name[da]=Diskforbrugsanalyse +Name[de]=Festplattenbelegungsanalyse +Name[dz]=ཌིཀསི་གི་བེད་སྤྱོད་དཔྱད་ཞིབ་པ། +Name[el]=Αναλυτής χρήσης δίσκου +Name[en_GB]=Disk Usage Analyser +Name[en@shaw]=𐑛𐑦𐑕𐑒 𐑿𐑕𐑦𐑡 𐑨𐑯𐑩𐑤𐑲𐑟𐑻 +Name[eo]=Diskuzada analizilo +Name[es]=Analizador de uso de disco +Name[et]=Kettakasutuse analüsaator +Name[eu]=Disko-erabileraren analizatzailea +Name[fa]=تحلیلگر مصرف دیسک +Name[fi]=Levynkäytön analysointi +Name[fr]=Analyseur d’utilisation des disques +Name[fur]=Analizadôr di utilizazion dal disc +Name[ga]=Anailíseoir Úsáid Diosca +Name[gd]=Sgrùdair cleachdadh nan diosga +Name[gl]=Analizador do uso do disco +Name[gu]=ડિસ્ક વપરાશકર્તા વિશ્લેષક +Name[he]=מנתח השימוש בכונן +Name[hi]=डिस्क प्रयोग विश्लेषण +Name[hr]=Analizator iskoristivosti diska +Name[hu]=Lemezhasználat-elemző +Name[id]=Penganalisa Penggunaan Diska +Name[is]=Diskapláss +Name[it]=Analizzatore di utilizzo del disco +Name[ja]=ディスク使用量アナライザー +Name[kk]=Диск қолдануын анализдеушісі +Name[km]=កម្មវិធី​វិភាគ​ការ​ប្រើ​ថាស +Name[kn]=ಡಿಸ್ಕ್‍ ಬಳಕೆಯ ವಿಶ್ಲೇಷಕ +Name[ko]=디스크 사용량 분석 +Name[ku]=Analîzkerê Bikaranîna Dîskê +Name[lt]=Disko naudojimo analizatorius +Name[lv]=Diska izmantojuma analizators +Name[mai]=डिस्क प्रयोग विश्लेषण +Name[mjw]=Disk Usage Analyzer +Name[mk]=Употребата на дискот +Name[ml]=ഡിസ്ക് യൂസേജ് അനലൈസർ +Name[mr]=डीस्क वापर विश्लेषक +Name[ms]=Penganalisis Penggunaan Cakera +Name[nb]=Analyse av diskplass +Name[nds]=Spiekergebruk unnersöken +Name[ne]=डिस्क प्रयोग विश्लेषक +Name[nl]=Schijfgebruik +Name[nn]=Analyse av diskplass +Name[oc]=Analisador d'utilizacion dels disques +Name[or]=ଡିସ୍କ ବ୍ଯବହାର ବିଧି ବିଶ୍ଳେଷକ +Name[pa]=ਡਿਸਕ ਵਰਤੋਂ ਜਾਂਚਕਾਰ +Name[pl]=Wykorzystanie dysku +Name[ps]=د ټيکلي کارونې شننونکی +Name[pt]=Analisador de utilização do disco +Name[pt_BR]=Analisador de uso de disco +Name[ro]=Analizatorul utilizării discului +Name[ru]=Анализатор использования дисков +Name[si]=තැටි භාවිත විශ්ලේෂකය +Name[sk]=Analyzátor využitia disku +Name[sl]=Orodje za preučevanje porabe diska +Name[sr]=Испитивач искоришћености диска +Name[sr@latin]=Ispitivač iskorišćenosti diska +Name[sv]=Diskanvändningsanalysator +Name[ta]=வட்டு பயன்பாடு ஆராய்வி +Name[te]=డిస్క్ వినిమయ విశ్లేషకం +Name[tg]=Таҳлилгари истифодаи диск +Name[th]=เครื่องมือวิเคราะห์การใช้ดิสก์ +Name[tr]=Disk Kullanımı İnceleyici +Name[ug]=دىسكا ئىشلىتىش تەھلىلچىسى +Name[uk]=Аналізатор використання диска +Name[vi]=Bộ phân tích đĩa +Name[zh_CN]=磁盘使用情况分析器 +Name[zh_HK]=磁碟用量分析器 +Name[zh_TW]=磁碟用量分析器 +Name=Disk Usage Analyzer +Comment[af]=Kontroleer gidsgroottes en beskikbare skyfspasie +Comment[an]=Compreba la grandaria d'as carpetas y lo espacio disponible en disco +Comment[ar]=افحص حجم المجلدات والمساحة المتوفرة +Comment[as]=ফোল্ডাৰৰ মাপ আৰু ডিস্কত উপলব্ধ স্থান নিৰীক্ষণ কৰক +Comment[ast]=Comprobar el tamañu de les carpetes y l'espaciu disponible en discu +Comment[be]=Праверка памеру папак і выкарыстання дыскавай прасторы +Comment[be@latin]=Spraŭdź pamiery katalohaŭ i dyskavuju prastoru +Comment[bg]=Проверка на размерите на папките и свободното пространство на диска +Comment[bn]=ফোল্ডারের মাপ ও ডিস্কে বিদ্যমান স্থান পরীক্ষা করা হবে +Comment[bn_IN]=ফোল্ডারের মাপ ও ডিস্কে উপলব্ধ স্থান পরীক্ষা করা হবে +Comment[br]=Gwiriañ mentoù an teuliadoù ha plas hegerz war ar gantennad +Comment[bs]=Provjeri veličinu direktorija i raspoloživ prostor na disku +Comment[ca]=Comprova la mida de les carpetes i l'espai disponible al disc +Comment[ca@valencia]=Comprova la mida de les carpetes i l'espai disponible al disc +Comment[ckb]=چێکردنی قەبارەی بوخچە و بۆشایی بەردەست لە پەپکەکاندا +Comment[crh]=Cilbent ölçülerini ve faydalanışlı disk fezasını teşker +Comment[cs]=Zkontrolovat velikost složek a dostupné místo na disku +Comment[da]=Kontrollér mappestørrelser og tilgængelig diskplads +Comment[de]=Ordnergrößen und freien Festplattenplatz analysieren +Comment[dz]=ཡིག་སྣོད་ཀྱི་ཚད་ཚུ་དང་འཐོབ་ཚུགས་པའི་ཌིཀསི་ས་སྟོང་ཞིབ་དཔྱད་འབད +Comment[el]=Έλεγχος μεγέθους φακέλων και διαθέσιμου χώρου στο δίσκο +Comment[en_GB]=Check folder sizes and available disk space +Comment[en@shaw]=𐑗𐑧𐑒 𐑓𐑴𐑤𐑛𐑼 𐑕𐑲𐑟𐑩𐑟 𐑯 𐑩𐑝𐑱𐑤𐑩𐑚𐑩𐑤 𐑛𐑦𐑕𐑒 𐑕𐑐𐑱𐑕 +Comment[eo]=Kontroli dosierujajn grandojn kaj disponeblan diskmemoron +Comment[es]=Compruebe el tamaño de las carpetas y el espacio disponible en disco +Comment[et]=Kaustade suuruse ja saadaoleva kettaruumi kontroll +Comment[eu]=Egiaztatu karpeten tamainak eta diskoan dagoen leku erabilgarria +Comment[fa]=بررسی اندازهٔ شاخه‌ها و فضای دیسک موجود +Comment[fi]=Tarkista kansioiden koko ja käytettävissä oleva levytila +Comment[fr]=Vérifier la taille des dossiers et l’espace disque disponible +Comment[fur]=Controle la dimension des cartelis e il spazi libar sul disc +Comment[ga]=Seiceáil méideanna fillteán agus spás diosca le fáil +Comment[gd]=Thoir sùil air meud nam pasganan ’s an rum shaor air an diosga +Comment[gl]=Verificar o tamaño dos cartafoles e o espazo dispoñíbel no disco +Comment[gu]=ફોલ્ડર માપો અને ઉપલબ્ધ ડિસ્ક જગ્યા ચકાસો +Comment[he]=בדיקת גדלי התיקיות והמקום פנוי בכונן +Comment[hi]=फोल्डर आकार जाँचें और उपलब्ध डिस्क स्थान +Comment[hr]=Provjerite veličinu mapa i dostupan prostor na disku +Comment[hu]=Mappaméretek és elérhető lemezterület vizsgálata +Comment[id]=Periksa ukuran folder dan ruang diska yang tersedia +Comment[is]=Athuga hve mikið pláss skrár taka á tölvunni og hve mikið pláss er eftir +Comment[it]=Controlla la dimensione delle cartelle e lo spazio disco disponibile +Comment[ja]=フォルダーと利用可能なディスク容量をチェックします +Comment[kk]=Бумалар өлшемдерін және дисктердегі қолжетерлік орынды тексеру +Comment[km]=ពិនិត្យ​មើល​ទំហំ​ថត និង​ទំហំ​ថាស​ដែល​អាច​ប្រើ​បាន +Comment[kn]=ಕಡತಕೋಶದ ಗಾತ್ರಗಳು ಹಾಗು ಲಭ್ಯವಿರುವ ಡಿಸ್ಕಿನ ಜಾಗಕ್ಕಾಗಿ ನೋಡು +Comment[ko]=폴더 용량과 디스크의 빈 공간을 검사합니다 +Comment[lt]=Tikrinti aplankų dydžius ir laisvą vietą +Comment[lv]=Pārbauda mapju izmērus un pieejamo diska vietu +Comment[mjw]=Folder apun lapen disk space angse kelang +Comment[mk]=Провери ја големината на папките и достапниот простор на дискот +Comment[ml]=ഫോൾഡറുകളുടെ വ്യാപ്തിയും ഡിസ്കില്‍ ലഭ്യമായ സ്ഥലവും പരിശോധിയ്ക്കുക +Comment[mr]=फोल्डर आकार व उपलब्ध डीस्क जागा तपासा +Comment[ms]=Periksa saiz folder dan ruang cakera yang tersedia +Comment[nb]=Sjekk mappestørrelser og tilgjengelig diskplass +Comment[ne]=फोल्डर साइज र उपलब्ध डिस्क खालीस्थान जाँच गर्नुहोस् +Comment[nl]=Mapgroottes en beschikbare schijfruimte bekijken +Comment[nn]=Undersøk mappestorleikar og tilgjengeleg diskplass +Comment[oc]=Verificar la talha dels dorsièrs e l'espaci de disc disponible +Comment[or]=ଫୋଲଡରର ଆକାର ଏବଂ ଉପଲବ୍ଧ ଡିସ୍କ ସ୍ଥାନ ଯାଞ୍ଚ କରନ୍ତୁ +Comment[pa]=ਫੋਲਡਰ ਸਾਇਜ਼ ਅਤੇ ਉਪਲੱਬਧ ਡਿਸਕ ਥਾਂ ਚੈੱਕ ਕਰੋ +Comment[pl]=Wyświetlanie rozmiaru katalogów i dostępnego miejsca na dysku +Comment[ps]=د پوښۍ کچونه او شته ټيکلی تشه وګورﺉ +Comment[pt]=Verificar o tamanho das pastas e o espaço disponível em disco +Comment[pt_BR]=Verifique o tamanho de pastas e o espaço disponível em disco +Comment[ro]=Verifică dimensiunea dosarului și spațiul disponibil pe disc +Comment[ru]=Изучение размера папок и свободного места на дисках +Comment[sk]=Kontroluje veľkosti priečinkov a dostupné miesto na disku +Comment[sl]=Preveri velikosti map in prostor na disku +Comment[sr]=Проверите величине фасцикли и слободан простор на диску +Comment[sr@latin]=Proverite veličine fascikli i slobodan prostor na disku +Comment[sv]=Kontrollera mappstorlekar och tillgängligt diskutrymme +Comment[ta]=அடைவு அளவு மற்றும் கிடைக்கக்கூடிய வட்டு இடைவெளி ஆகியவற்றை சரிபார் +Comment[te]=అందుబాటులోవున్న డిస్క్ స్థలం మరియు సంచయపు పరిమాణాలను తనిఖీచేయి +Comment[tg]=Санҷиши андозаи ҷузвдонҳо ва фазои диски дастрас +Comment[th]=ตรวจสอบขนาดของโฟลเดอร์ต่างๆ และเนื้อที่ว่างในดิสก์ +Comment[tr]=Klasör boyutlarını ve kullanılabilir disk alanını denetle +Comment[ug]=قىسقۇچ چوڭلۇقى ۋە ئىشلىتىشكە بولىدىغان دىسكا بوشلۇقىنى تەكشۈر +Comment[uk]=Перевірте розміри тек та дисковий простір +Comment[vi]=Kiểm tra kích cỡ của thư mục và chỗ trống trên đĩa +Comment[zh_CN]=检查文件夹大小和可用磁盘空间 +Comment[zh_HK]=檢查資料夾大小與可用的磁碟空間 +Comment[zh_TW]=檢查資料夾大小與可用的磁碟空間 +Comment=Check folder sizes and available disk space +Keywords=storage;space;cleanup; +TryExec=ncdu +Exec=ncdu +Icon=baobab +Terminal=true +Type=Application +Categories=ConsoleOnly;System;Filesystem;Utility; diff --git a/linux-live/modules/cinnamon/03-cinnamon-desktop/standard.list b/linux-live/modules/cinnamon/03-cinnamon-desktop/standard.list new file mode 100644 index 0000000..7eb4f53 --- /dev/null +++ b/linux-live/modules/cinnamon/03-cinnamon-desktop/standard.list @@ -0,0 +1,8 @@ +locales +dbus-x11 +slim +cinnamon-core +gvfs-backends +samba-common +avahi-daemon +faenza-icon-theme diff --git a/linux-live/modules/cinnamon/04-cinnamon-apps/install b/linux-live/modules/cinnamon/04-cinnamon-apps/install new file mode 100644 index 0000000..00eca10 --- /dev/null +++ b/linux-live/modules/cinnamon/04-cinnamon-apps/install @@ -0,0 +1,32 @@ +#!/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_VARIANT.list ]; then + $APT_CMD update && + $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ + $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 +fi + +if [ $PACKAGE_VARIANT = "standard" ]; then + if [ $DISTRIBUTION = "stretch" ]; then + echo 'deb http://ftp.debian.org/debian stretch-backports main' | sudo tee --append /etc/apt/sources.list.d/stretch-backports.list >>$OUTPUT 2>&1 + $APT_CMD update && + $APT_CMD install -t stretch-backports $APT_OPTIONS $APT_OPTIONS2 \ + remmina remmina-plugin-rdp remmina-plugin-vnc >>$OUTPUT 2>&1 + else + $APT_CMD update && + $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ + remmina remmina-plugin-rdp remmina-plugin-vnc >>$OUTPUT 2>&1 + + fi +fi + +if [ $PACKAGE_VARIANT = "minimal" ]; then + sed -i 's,create=xarchiver --add-to,create=xarchiver --compress,g' /usr/share/libfm/archivers.list +fi diff --git a/linux-live/modules/minios/04-xfce-apps/minimal.list b/linux-live/modules/cinnamon/04-cinnamon-apps/minimal.list similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/minimal.list rename to linux-live/modules/cinnamon/04-cinnamon-apps/minimal.list diff --git a/linux-live/modules/cinnamon/04-cinnamon-apps/postinstall b/linux-live/modules/cinnamon/04-cinnamon-apps/postinstall new file mode 100644 index 0000000..6cc29b5 --- /dev/null +++ b/linux-live/modules/cinnamon/04-cinnamon-apps/postinstall @@ -0,0 +1,4 @@ +#!/bin/bash + +rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1 +rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1 diff --git a/linux-live/modules/cinnamon/04-cinnamon-apps/standard.list b/linux-live/modules/cinnamon/04-cinnamon-apps/standard.list new file mode 100644 index 0000000..e46364f --- /dev/null +++ b/linux-live/modules/cinnamon/04-cinnamon-apps/standard.list @@ -0,0 +1,8 @@ +gedit +file-roller +eog +gnome-terminal +gnome-system-monitor +gnome-screenshot +vlc +gparted \ No newline at end of file diff --git a/linux-live/modules/cinnamon/05-firefox b/linux-live/modules/cinnamon/05-firefox new file mode 120000 index 0000000..12cce8d --- /dev/null +++ b/linux-live/modules/cinnamon/05-firefox @@ -0,0 +1 @@ +../xfce/05-firefox \ No newline at end of file diff --git a/linux-live/modules/slax/01-firmware b/linux-live/modules/slax/01-firmware new file mode 120000 index 0000000..23377da --- /dev/null +++ b/linux-live/modules/slax/01-firmware @@ -0,0 +1 @@ +../xfce/01-firmware \ No newline at end of file diff --git a/linux-live/modules/slax/01-firmware/install b/linux-live/modules/slax/01-firmware/install deleted file mode 100644 index 0ea3419..0000000 --- a/linux-live/modules/slax/01-firmware/install +++ /dev/null @@ -1,29 +0,0 @@ -#!/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")")" - -echo "firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true" | debconf-set-selections -echo "b43-fwcutter b43-fwcutter/install-unconditional boolean true" | debconf-set-selections - -$APT_CMD update >>$OUTPUT 2>&1 - -# install packages -if [ $DISTRIBUTION_TYPE = "ubuntu" ]; then - if [ $DISTRIBUTION = "focal" ] || [ $DISTRIBUTION = "bionic" ]; then - $APT_CMD install $APT_OPTIONS \ - linux-firmware firmware-b43-installer firmware-ath9k-htc >>$OUTPUT 2>&1 - else - $APT_CMD install $APT_OPTIONS \ - #linux-firmware >>$OUTPUT 2>&1 #firmware-b43-installer - linux-image-generic - fi -else - if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then - $APT_CMD install $APT_OPTIONS \ - $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 - fi -fi diff --git a/linux-live/modules/slax/01-firmware/minimal.list b/linux-live/modules/slax/01-firmware/minimal.list deleted file mode 100644 index b8cb39c..0000000 --- a/linux-live/modules/slax/01-firmware/minimal.list +++ /dev/null @@ -1,13 +0,0 @@ -firmware-linux-free -firmware-linux-nonfree -firmware-atheros -firmware-iwlwifi -firmware-zd1211 -firmware-realtek -firmware-bnx2 -firmware-brcm80211 -firmware-cavium -firmware-ipw2x00 -firmware-libertas -firmware-ti-connectivity -firmware-b43-installer \ No newline at end of file diff --git a/linux-live/modules/slax/01-firmware/standard.list b/linux-live/modules/slax/01-firmware/standard.list deleted file mode 100644 index b8cb39c..0000000 --- a/linux-live/modules/slax/01-firmware/standard.list +++ /dev/null @@ -1,13 +0,0 @@ -firmware-linux-free -firmware-linux-nonfree -firmware-atheros -firmware-iwlwifi -firmware-zd1211 -firmware-realtek -firmware-bnx2 -firmware-brcm80211 -firmware-cavium -firmware-ipw2x00 -firmware-libertas -firmware-ti-connectivity -firmware-b43-installer \ No newline at end of file diff --git a/linux-live/modules/slax/02-xorg b/linux-live/modules/slax/02-xorg new file mode 120000 index 0000000..055971c --- /dev/null +++ b/linux-live/modules/slax/02-xorg @@ -0,0 +1 @@ +../xfce/02-xorg \ No newline at end of file diff --git a/linux-live/modules/slax/02-xorg/install b/linux-live/modules/slax/02-xorg/install deleted file mode 100644 index dde6edf..0000000 --- a/linux-live/modules/slax/02-xorg/install +++ /dev/null @@ -1,28 +0,0 @@ -#!/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")")" - -echo "keyboard-configuration keyboard-configuration/variant select English (US)" | debconf-set-selections - -$APT_CMD update >>$OUTPUT 2>&1 - -# install packages -if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then - $APT_CMD install $APT_OPTIONS \ - $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 -fi - -cat </usr/lib/systemd/system/xorg.service -[Unit] -Description=X-Window -ConditionKernelCommandLine=!text -After=systemd-user-sessions.service - -[Service] -ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live - -EOF diff --git a/linux-live/modules/slax/02-xorg/minimal.list b/linux-live/modules/slax/02-xorg/minimal.list deleted file mode 100644 index 5b401b4..0000000 --- a/linux-live/modules/slax/02-xorg/minimal.list +++ /dev/null @@ -1,14 +0,0 @@ -xserver-xorg -xserver-xorg-video-all -xserver-xorg-video-intel -xinit -xterm -blackbox -libxcursor1 -breeze-cursor-theme -x11-utils -wmctrl -xdotool -libdrm-intel1 -libgl1-mesa-dri -libglu1-mesa \ No newline at end of file diff --git a/linux-live/modules/slax/02-xorg/postinstall b/linux-live/modules/slax/02-xorg/postinstall deleted file mode 100644 index 5358a85..0000000 --- a/linux-live/modules/slax/02-xorg/postinstall +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Set setuid bit on xorg binary, so it can be started by guest user -chmod u+s /usr/lib/xorg/Xorg - -# use only white cursors. There were some troubles if the other cursors -# was left behind, installing gtk apps reverted the cursor from white to gray, -# so we're going to nuke it to leave only Snow cursors active. -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-install && cp --parents -afr * /) - -# install x11 server utils, apt-get would add cpp dependency, bullshit! -cd /tmp -apt-get download x11-xserver-utils >>$OUTPUT 2>&1 -ls -la -dpkg -x x11-xserver-utils*.deb /tmp/x11utils >>$OUTPUT 2>&1 -cd /tmp/x11utils -cp -aR * / >>$OUTPUT 2>&1 - -rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1 - -update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1 diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.Xresources b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.Xresources deleted file mode 100644 index a6d2cc5..0000000 --- a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.Xresources +++ /dev/null @@ -1,32 +0,0 @@ -! this are Xresources to make xterm look good -! put into ~/.Xresources -! after changing contents, run xrdb -merge .Xresources -! gentoo has a bug so that it doesnt read it when X starts, so add above -! command to /etc/xfce4/xinitrc (top) and be happy. - -XTerm*termName: xterm-256color -XTerm*foreground: white -XTerm*background: rgb:22/22/22 -XTerm*cursorColor: rgb:00/ff/00 -XTerm*borderColor: black -XTerm*scrollColor: black -XTerm*visualBell: true -XTerm*saveLines: 1000 -XTerm*allowSendEvents: true -XTerm*sessionMgt: false -XTerm*scrollBar: true -XTerm*rightScrollBar: true -XTerm*eightBitInput: false -XTerm*faceName: DejaVu Sans Mono: size=9 -XTerm*boldFont: DejaVu Sans Mono Bold: size=9 -XTerm*renderFont: true -XTerm*activeIcon: true -XTerm*iconPixmap: /usr/share/icons/locolor/16x16/apps/xterm.xbm -XTerm*fullscreen: never -XTerm*selectToClipboard: true -Xft.dpi: 96 -Xft.antialias: true -Xft.hinting: true -Xft.hintstyle: hintlight -Xft.lcdfilter: lcddefault -Xft.rgba: rgb \ No newline at end of file diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackbox-menu b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackbox-menu deleted file mode 100644 index 093ae2a..0000000 --- a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackbox-menu +++ /dev/null @@ -1,4 +0,0 @@ -[begin] ( Menu ) - [exec] (Terminal) { xterm -ls -title Terminal } - [exit] (Exit) -[end] diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackboxrc b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackboxrc deleted file mode 100644 index a39f965..0000000 --- a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackboxrc +++ /dev/null @@ -1,6 +0,0 @@ -session.screen0.toolbar.widthPercent: 100 -session.screen0.strftimeFormat: %H:%M -session.edgeSnapThreshold: 10 -session.menuFile: /root/.blackbox-menu -session.styleFile: /usr/share/blackbox/styles/Slax -session.changeWorkspaceWithMouseWheel: False diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.xinitrc b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.xinitrc deleted file mode 100644 index 5118998..0000000 --- a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.xinitrc +++ /dev/null @@ -1,2 +0,0 @@ -xrdb -merge .Xresources -blackbox \ No newline at end of file diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service deleted file mode 120000 index d31ece8..0000000 --- a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/xorg.service \ No newline at end of file diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service b/linux-live/modules/slax/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service deleted file mode 100644 index 3928ee8..0000000 --- a/linux-live/modules/slax/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=X-Window -ConditionKernelCommandLine=!text -After=systemd-user-sessions.service - -[Service] -ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax b/linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax deleted file mode 100644 index aefe9ef..0000000 --- a/linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax +++ /dev/null @@ -1,79 +0,0 @@ -*.appearance: flat solid - -*button.pressed.appearance: sunken solid -*button.pressed.backgroundColor: rgb:69/c1/f1 -*button.appearance: parentrelative - -*.focus.backgroundColor: rgb:69/c1/f1 -*.unfocus.backgroundColor: rgb:28/28/28 - -*font: Bitstream Vera Sans-9 - -menu.title.appearance: flat solid -menu.title.backgroundColor: rgb:69/c1/f1 -menu.title.textColor: rgb:28/28/28 -menu.title.alignment: center -menu.title.marginWidth: 6 - -menu.frame.appearance: flat gradient border -menu.frame.textColor: rgb:28/28/28 -menu.frame.foregroundColor: grey40 -menu.frame.borderColor: rgb:69/c1/f1 -menu.frame.borderWidth: 6 -menu.frame.disabledColor: darkgrey -menu.frame.alignment: left -menu.frame.marginWidth: 2 - -menu.active.appearance: flat solid border -menu.active.backgroundColor: rgb:69/c1/f1 -menu.active.borderWidth: 4 -menu.active.borderColor: rgb:69/c1/f1 -menu.active.textColor: rgb:38/38/38 - -rootCommand: bsetroot -solid rgb:77/90/aa - -slit.appearance: raised solid -slit.backgroundColor: rgb:77/90/aa -slit.marginWidth: 3 - -toolbar.appearance: flat gradient border -toolbar.alignment: center -toolbar*textColor: rgb:28/28/28 -toolbar.label.appearance: parentrelative -toolbar.clock.appearance: parentrelative -toolbar.windowLabel.appearance: parentrelative - -window.title.focus.appearance: flat solid -window.title.focus.backgroundColor: rgb:69/c1/f1 -window.title.unfocus.appearance: flat solid -window.title.unfocus.backgroundColor: rgb:d6/d6/d6 -window.title.marginWidth: 5 - -window.label.focus.appearance: parentrelative -window.label.focus.textColor: rgb:28/28/28 -window.label.unfocus.appearance: parentrelative -window.label.unfocus.textColor: rgb:28/28/28 -window.label.marginWidth: 1 - -window.button.focus.appearance: parentrelative -window.button.focus.foregroundColor: white - -window.button.unfocus.appearance: parentrelative -window.button.unfocus.foregroundColor: darkgrey - -window.handle.focus.appearance: flat solid -window.handle.focus.backgroundColor: rgb:69/c1/f1 -window.handle.unfocus.appearance: flat solid -window.handle.unfocus.backgroundColor: rgb:d6/d6/d6 - -window.grip.focus.appearance: flat solid -window.grip.focus.backgroundColor: rgb:69/c1/f1 -window.grip.unfocus.appearance: flat solid -window.grip.unfocus.backgroundColor: rgb:d6/d6/d6 - -window*alignment: center - -window.handleHeight: 7 -window.frame.borderWidth: 7 -window.frame.focus.borderColor: rgb:69/c1/f1 -window.frame.unfocus.borderColor: rgb:d6/d6/d6 diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm b/linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm deleted file mode 100644 index 0cd329e..0000000 --- a/linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm +++ /dev/null @@ -1,6 +0,0 @@ -#define command2_width 16 -#define command2_height 16 -static unsigned char command2_bits[] = { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xe7, 0xff, 0xcf, 0xff, - 0x9f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x9f, 0xff, 0xcf, 0xff, 0xe7, 0xc1, - 0xf7, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; diff --git a/linux-live/modules/slax/02-xorg/standard.list b/linux-live/modules/slax/02-xorg/standard.list deleted file mode 100644 index dcb6662..0000000 --- a/linux-live/modules/slax/02-xorg/standard.list +++ /dev/null @@ -1,15 +0,0 @@ -xserver-xorg -xserver-xorg-video-all -xserver-xorg-video-intel -xinit -xterm -blackbox -libxcursor1 -breeze-cursor-theme -x11-utils -wmctrl -xdotool -libdrm-intel1 -libgl1-mesa-dri -libglu1-mesa -open-vm-tools-desktop \ No newline at end of file diff --git a/linux-live/modules/test/01-firmware/install b/linux-live/modules/test/01-firmware/install deleted file mode 100644 index 0ea3419..0000000 --- a/linux-live/modules/test/01-firmware/install +++ /dev/null @@ -1,29 +0,0 @@ -#!/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")")" - -echo "firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true" | debconf-set-selections -echo "b43-fwcutter b43-fwcutter/install-unconditional boolean true" | debconf-set-selections - -$APT_CMD update >>$OUTPUT 2>&1 - -# install packages -if [ $DISTRIBUTION_TYPE = "ubuntu" ]; then - if [ $DISTRIBUTION = "focal" ] || [ $DISTRIBUTION = "bionic" ]; then - $APT_CMD install $APT_OPTIONS \ - linux-firmware firmware-b43-installer firmware-ath9k-htc >>$OUTPUT 2>&1 - else - $APT_CMD install $APT_OPTIONS \ - #linux-firmware >>$OUTPUT 2>&1 #firmware-b43-installer - linux-image-generic - fi -else - if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then - $APT_CMD install $APT_OPTIONS \ - $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 - fi -fi diff --git a/linux-live/modules/test/01-firmware/minimal.list b/linux-live/modules/test/01-firmware/minimal.list deleted file mode 100644 index b8cb39c..0000000 --- a/linux-live/modules/test/01-firmware/minimal.list +++ /dev/null @@ -1,13 +0,0 @@ -firmware-linux-free -firmware-linux-nonfree -firmware-atheros -firmware-iwlwifi -firmware-zd1211 -firmware-realtek -firmware-bnx2 -firmware-brcm80211 -firmware-cavium -firmware-ipw2x00 -firmware-libertas -firmware-ti-connectivity -firmware-b43-installer \ No newline at end of file diff --git a/linux-live/modules/test/01-firmware/standard.list b/linux-live/modules/test/01-firmware/standard.list deleted file mode 100644 index b8cb39c..0000000 --- a/linux-live/modules/test/01-firmware/standard.list +++ /dev/null @@ -1,13 +0,0 @@ -firmware-linux-free -firmware-linux-nonfree -firmware-atheros -firmware-iwlwifi -firmware-zd1211 -firmware-realtek -firmware-bnx2 -firmware-brcm80211 -firmware-cavium -firmware-ipw2x00 -firmware-libertas -firmware-ti-connectivity -firmware-b43-installer \ No newline at end of file diff --git a/linux-live/modules/test/02-xorg/install b/linux-live/modules/test/02-xorg/install deleted file mode 100644 index e685c76..0000000 --- a/linux-live/modules/test/02-xorg/install +++ /dev/null @@ -1,33 +0,0 @@ -#!/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")")" - -echo "keyboard-configuration keyboard-configuration/variant select English (US)" | debconf-set-selections - -$APT_CMD update >>$OUTPUT 2>&1 - -# install packages -if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then - $APT_CMD install $APT_OPTIONS \ - $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 -fi - -cat </usr/lib/systemd/system/xorg.service -[Unit] -Description=X-Window -ConditionKernelCommandLine=!text -After=systemd-user-sessions.service - -[Service] -ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live - -EOF - -update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1 -if [ ! -L /etc/alternatives/x-terminal-emulator ]; then - ln -s /usr/bin/xterm /etc/alternatives/x-terminal-emulator -fi diff --git a/linux-live/modules/test/02-xorg/minimal.list b/linux-live/modules/test/02-xorg/minimal.list deleted file mode 100644 index 5b401b4..0000000 --- a/linux-live/modules/test/02-xorg/minimal.list +++ /dev/null @@ -1,14 +0,0 @@ -xserver-xorg -xserver-xorg-video-all -xserver-xorg-video-intel -xinit -xterm -blackbox -libxcursor1 -breeze-cursor-theme -x11-utils -wmctrl -xdotool -libdrm-intel1 -libgl1-mesa-dri -libglu1-mesa \ No newline at end of file diff --git a/linux-live/modules/test/02-xorg/postinstall b/linux-live/modules/test/02-xorg/postinstall deleted file mode 100644 index 5358a85..0000000 --- a/linux-live/modules/test/02-xorg/postinstall +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Set setuid bit on xorg binary, so it can be started by guest user -chmod u+s /usr/lib/xorg/Xorg - -# use only white cursors. There were some troubles if the other cursors -# was left behind, installing gtk apps reverted the cursor from white to gray, -# so we're going to nuke it to leave only Snow cursors active. -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-install && cp --parents -afr * /) - -# install x11 server utils, apt-get would add cpp dependency, bullshit! -cd /tmp -apt-get download x11-xserver-utils >>$OUTPUT 2>&1 -ls -la -dpkg -x x11-xserver-utils*.deb /tmp/x11utils >>$OUTPUT 2>&1 -cd /tmp/x11utils -cp -aR * / >>$OUTPUT 2>&1 - -rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1 - -update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1 diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.Xresources b/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.Xresources deleted file mode 100644 index a6d2cc5..0000000 --- a/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.Xresources +++ /dev/null @@ -1,32 +0,0 @@ -! this are Xresources to make xterm look good -! put into ~/.Xresources -! after changing contents, run xrdb -merge .Xresources -! gentoo has a bug so that it doesnt read it when X starts, so add above -! command to /etc/xfce4/xinitrc (top) and be happy. - -XTerm*termName: xterm-256color -XTerm*foreground: white -XTerm*background: rgb:22/22/22 -XTerm*cursorColor: rgb:00/ff/00 -XTerm*borderColor: black -XTerm*scrollColor: black -XTerm*visualBell: true -XTerm*saveLines: 1000 -XTerm*allowSendEvents: true -XTerm*sessionMgt: false -XTerm*scrollBar: true -XTerm*rightScrollBar: true -XTerm*eightBitInput: false -XTerm*faceName: DejaVu Sans Mono: size=9 -XTerm*boldFont: DejaVu Sans Mono Bold: size=9 -XTerm*renderFont: true -XTerm*activeIcon: true -XTerm*iconPixmap: /usr/share/icons/locolor/16x16/apps/xterm.xbm -XTerm*fullscreen: never -XTerm*selectToClipboard: true -Xft.dpi: 96 -Xft.antialias: true -Xft.hinting: true -Xft.hintstyle: hintlight -Xft.lcdfilter: lcddefault -Xft.rgba: rgb \ No newline at end of file diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackbox-menu b/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackbox-menu deleted file mode 100644 index 093ae2a..0000000 --- a/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackbox-menu +++ /dev/null @@ -1,4 +0,0 @@ -[begin] ( Menu ) - [exec] (Terminal) { xterm -ls -title Terminal } - [exit] (Exit) -[end] diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackboxrc b/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackboxrc deleted file mode 100644 index a39f965..0000000 --- a/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackboxrc +++ /dev/null @@ -1,6 +0,0 @@ -session.screen0.toolbar.widthPercent: 100 -session.screen0.strftimeFormat: %H:%M -session.edgeSnapThreshold: 10 -session.menuFile: /root/.blackbox-menu -session.styleFile: /usr/share/blackbox/styles/Slax -session.changeWorkspaceWithMouseWheel: False diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.xinitrc b/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.xinitrc deleted file mode 100644 index 5118998..0000000 --- a/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.xinitrc +++ /dev/null @@ -1,2 +0,0 @@ -xrdb -merge .Xresources -blackbox \ No newline at end of file diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service b/linux-live/modules/test/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service deleted file mode 120000 index d31ece8..0000000 --- a/linux-live/modules/test/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/xorg.service \ No newline at end of file diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service b/linux-live/modules/test/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service deleted file mode 100644 index 3928ee8..0000000 --- a/linux-live/modules/test/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=X-Window -ConditionKernelCommandLine=!text -After=systemd-user-sessions.service - -[Service] -ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax b/linux-live/modules/test/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax deleted file mode 100644 index aefe9ef..0000000 --- a/linux-live/modules/test/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax +++ /dev/null @@ -1,79 +0,0 @@ -*.appearance: flat solid - -*button.pressed.appearance: sunken solid -*button.pressed.backgroundColor: rgb:69/c1/f1 -*button.appearance: parentrelative - -*.focus.backgroundColor: rgb:69/c1/f1 -*.unfocus.backgroundColor: rgb:28/28/28 - -*font: Bitstream Vera Sans-9 - -menu.title.appearance: flat solid -menu.title.backgroundColor: rgb:69/c1/f1 -menu.title.textColor: rgb:28/28/28 -menu.title.alignment: center -menu.title.marginWidth: 6 - -menu.frame.appearance: flat gradient border -menu.frame.textColor: rgb:28/28/28 -menu.frame.foregroundColor: grey40 -menu.frame.borderColor: rgb:69/c1/f1 -menu.frame.borderWidth: 6 -menu.frame.disabledColor: darkgrey -menu.frame.alignment: left -menu.frame.marginWidth: 2 - -menu.active.appearance: flat solid border -menu.active.backgroundColor: rgb:69/c1/f1 -menu.active.borderWidth: 4 -menu.active.borderColor: rgb:69/c1/f1 -menu.active.textColor: rgb:38/38/38 - -rootCommand: bsetroot -solid rgb:77/90/aa - -slit.appearance: raised solid -slit.backgroundColor: rgb:77/90/aa -slit.marginWidth: 3 - -toolbar.appearance: flat gradient border -toolbar.alignment: center -toolbar*textColor: rgb:28/28/28 -toolbar.label.appearance: parentrelative -toolbar.clock.appearance: parentrelative -toolbar.windowLabel.appearance: parentrelative - -window.title.focus.appearance: flat solid -window.title.focus.backgroundColor: rgb:69/c1/f1 -window.title.unfocus.appearance: flat solid -window.title.unfocus.backgroundColor: rgb:d6/d6/d6 -window.title.marginWidth: 5 - -window.label.focus.appearance: parentrelative -window.label.focus.textColor: rgb:28/28/28 -window.label.unfocus.appearance: parentrelative -window.label.unfocus.textColor: rgb:28/28/28 -window.label.marginWidth: 1 - -window.button.focus.appearance: parentrelative -window.button.focus.foregroundColor: white - -window.button.unfocus.appearance: parentrelative -window.button.unfocus.foregroundColor: darkgrey - -window.handle.focus.appearance: flat solid -window.handle.focus.backgroundColor: rgb:69/c1/f1 -window.handle.unfocus.appearance: flat solid -window.handle.unfocus.backgroundColor: rgb:d6/d6/d6 - -window.grip.focus.appearance: flat solid -window.grip.focus.backgroundColor: rgb:69/c1/f1 -window.grip.unfocus.appearance: flat solid -window.grip.unfocus.backgroundColor: rgb:d6/d6/d6 - -window*alignment: center - -window.handleHeight: 7 -window.frame.borderWidth: 7 -window.frame.focus.borderColor: rgb:69/c1/f1 -window.frame.unfocus.borderColor: rgb:d6/d6/d6 diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm b/linux-live/modules/test/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm deleted file mode 100644 index 0cd329e..0000000 --- a/linux-live/modules/test/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm +++ /dev/null @@ -1,6 +0,0 @@ -#define command2_width 16 -#define command2_height 16 -static unsigned char command2_bits[] = { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xe7, 0xff, 0xcf, 0xff, - 0x9f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x9f, 0xff, 0xcf, 0xff, 0xe7, 0xc1, - 0xf7, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; diff --git a/linux-live/modules/test/02-xorg/standard.list b/linux-live/modules/test/02-xorg/standard.list deleted file mode 100644 index dcb6662..0000000 --- a/linux-live/modules/test/02-xorg/standard.list +++ /dev/null @@ -1,15 +0,0 @@ -xserver-xorg -xserver-xorg-video-all -xserver-xorg-video-intel -xinit -xterm -blackbox -libxcursor1 -breeze-cursor-theme -x11-utils -wmctrl -xdotool -libdrm-intel1 -libgl1-mesa-dri -libglu1-mesa -open-vm-tools-desktop \ No newline at end of file diff --git a/linux-live/modules/minios/01-firmware/install b/linux-live/modules/xfce/01-firmware/install similarity index 100% rename from linux-live/modules/minios/01-firmware/install rename to linux-live/modules/xfce/01-firmware/install diff --git a/linux-live/modules/minios/01-firmware/minimal.list b/linux-live/modules/xfce/01-firmware/minimal.list similarity index 100% rename from linux-live/modules/minios/01-firmware/minimal.list rename to linux-live/modules/xfce/01-firmware/minimal.list diff --git a/linux-live/modules/minios/01-firmware/standard.list b/linux-live/modules/xfce/01-firmware/standard.list similarity index 100% rename from linux-live/modules/minios/01-firmware/standard.list rename to linux-live/modules/xfce/01-firmware/standard.list diff --git a/linux-live/modules/minios/02-xorg/install b/linux-live/modules/xfce/02-xorg/install similarity index 100% rename from linux-live/modules/minios/02-xorg/install rename to linux-live/modules/xfce/02-xorg/install diff --git a/linux-live/modules/minios/02-xorg/minimal.list b/linux-live/modules/xfce/02-xorg/minimal.list similarity index 100% rename from linux-live/modules/minios/02-xorg/minimal.list rename to linux-live/modules/xfce/02-xorg/minimal.list diff --git a/linux-live/modules/minios/02-xorg/postinstall b/linux-live/modules/xfce/02-xorg/postinstall similarity index 100% rename from linux-live/modules/minios/02-xorg/postinstall rename to linux-live/modules/xfce/02-xorg/postinstall diff --git a/linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.Xresources b/linux-live/modules/xfce/02-xorg/rootcopy-install/etc/skel/.Xresources similarity index 100% rename from linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.Xresources rename to linux-live/modules/xfce/02-xorg/rootcopy-install/etc/skel/.Xresources diff --git a/linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.blackbox-menu b/linux-live/modules/xfce/02-xorg/rootcopy-install/etc/skel/.blackbox-menu similarity index 100% rename from linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.blackbox-menu rename to linux-live/modules/xfce/02-xorg/rootcopy-install/etc/skel/.blackbox-menu diff --git a/linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.blackboxrc b/linux-live/modules/xfce/02-xorg/rootcopy-install/etc/skel/.blackboxrc similarity index 100% rename from linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.blackboxrc rename to linux-live/modules/xfce/02-xorg/rootcopy-install/etc/skel/.blackboxrc diff --git a/linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.xinitrc b/linux-live/modules/xfce/02-xorg/rootcopy-install/etc/skel/.xinitrc similarity index 100% rename from linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.xinitrc rename to linux-live/modules/xfce/02-xorg/rootcopy-install/etc/skel/.xinitrc diff --git a/linux-live/modules/minios/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service b/linux-live/modules/xfce/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service similarity index 100% rename from linux-live/modules/minios/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service rename to linux-live/modules/xfce/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service diff --git a/linux-live/modules/minios/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service b/linux-live/modules/xfce/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service similarity index 100% rename from linux-live/modules/minios/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service rename to linux-live/modules/xfce/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service diff --git a/linux-live/modules/minios/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax b/linux-live/modules/xfce/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax similarity index 100% rename from linux-live/modules/minios/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax rename to linux-live/modules/xfce/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax diff --git a/linux-live/modules/minios/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm b/linux-live/modules/xfce/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm similarity index 100% rename from linux-live/modules/minios/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm rename to linux-live/modules/xfce/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm diff --git a/linux-live/modules/minios/02-xorg/standard.list b/linux-live/modules/xfce/02-xorg/standard.list similarity index 100% rename from linux-live/modules/minios/02-xorg/standard.list rename to linux-live/modules/xfce/02-xorg/standard.list diff --git a/linux-live/modules/minios/03-xfce-desktop/install b/linux-live/modules/xfce/03-xfce-desktop/install similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/install rename to linux-live/modules/xfce/03-xfce-desktop/install diff --git a/linux-live/modules/minios/03-xfce-desktop/minimal.list b/linux-live/modules/xfce/03-xfce-desktop/minimal.list similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/minimal.list rename to linux-live/modules/xfce/03-xfce-desktop/minimal.list diff --git a/linux-live/modules/minios/03-xfce-desktop/postinstall b/linux-live/modules/xfce/03-xfce-desktop/postinstall similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/postinstall rename to linux-live/modules/xfce/03-xfce-desktop/postinstall diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/default/nodm b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/default/nodm similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/default/nodm rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/default/nodm diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.xsession b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.xsession similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.xsession rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/etc/skel/.xsession diff --git a/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg new file mode 100644 index 0000000..9c8639a --- /dev/null +++ b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg new file mode 100644 index 0000000..ca13046 --- /dev/null +++ b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg @@ -0,0 +1,149 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png new file mode 100644 index 0000000..966915d Binary files /dev/null and b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png differ diff --git a/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png new file mode 100644 index 0000000..8d01ac8 Binary files /dev/null and b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png differ diff --git a/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme new file mode 100644 index 0000000..b70182b --- /dev/null +++ b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme @@ -0,0 +1,36 @@ +# greeny_dark theme for SLIM +# by aditya shakya +# using artwork from some free html+css login templates on the internet + +# Messages (ie: shutdown) + +msg_color #b5cd60 +msg_font Sans:size=18:bold:dpi=75 +msg_x 50% +msg_y 30% + +# Session Name + +session_color #b5cd60 +session_font Sans:size=16:bold:dpi=75 +session_x 50% +session_y 90% + +# valid values: stretch, tile + +background_style stretch +background_color #f2f2f2 + +# Input controls + +input_panel_x 50% +input_panel_y 50% +input_name_x 200 +input_name_y 78 +input_pass_x 200 +input_pass_y 145 +input_font Sans:size=14:dpi=75 +input_color #b5cd60 + +username_msg +password_msg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg b/linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg rename to linux-live/modules/xfce/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg diff --git a/linux-live/modules/minios/03-xfce-desktop/standard.list b/linux-live/modules/xfce/03-xfce-desktop/standard.list similarity index 100% rename from linux-live/modules/minios/03-xfce-desktop/standard.list rename to linux-live/modules/xfce/03-xfce-desktop/standard.list diff --git a/linux-live/modules/minios/04-xfce-apps/install b/linux-live/modules/xfce/04-xfce-apps/install similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/install rename to linux-live/modules/xfce/04-xfce-apps/install diff --git a/linux-live/modules/xfce/04-xfce-apps/minimal.list b/linux-live/modules/xfce/04-xfce-apps/minimal.list new file mode 100644 index 0000000..81ee1ec --- /dev/null +++ b/linux-live/modules/xfce/04-xfce-apps/minimal.list @@ -0,0 +1,3 @@ +mousepad +xarchiver +ristretto \ No newline at end of file diff --git a/linux-live/modules/minios/04-xfce-apps/postinstall b/linux-live/modules/xfce/04-xfce-apps/postinstall similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/postinstall rename to linux-live/modules/xfce/04-xfce-apps/postinstall diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png diff --git a/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/pixmaps/qalculate.png b/linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/pixmaps/qalculate.png similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/pixmaps/qalculate.png rename to linux-live/modules/xfce/04-xfce-apps/rootcopy-install/usr/share/pixmaps/qalculate.png diff --git a/linux-live/modules/minios/04-xfce-apps/standard.list b/linux-live/modules/xfce/04-xfce-apps/standard.list similarity index 100% rename from linux-live/modules/minios/04-xfce-apps/standard.list rename to linux-live/modules/xfce/04-xfce-apps/standard.list diff --git a/linux-live/modules/minios/05-firefox/install b/linux-live/modules/xfce/05-firefox/install similarity index 100% rename from linux-live/modules/minios/05-firefox/install rename to linux-live/modules/xfce/05-firefox/install diff --git a/linux-live/modules/xfce/05-firefox/postinstall b/linux-live/modules/xfce/05-firefox/postinstall new file mode 100644 index 0000000..6cc29b5 --- /dev/null +++ b/linux-live/modules/xfce/05-firefox/postinstall @@ -0,0 +1,4 @@ +#!/bin/bash + +rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1 +rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1