From 3bb814e1b343bcaccbe4a3ebf457651cea3b577c Mon Sep 17 00:00:00 2001 From: crims0n Date: Sat, 28 Aug 2021 19:44:50 +0300 Subject: [PATCH] update (383 changes) --- .../etc/adjtime | 0 .../etc/apt/apt.conf.d/000Slax | 0 .../etc/hostname | 0 .../{rootcopy => rootcopy-install}/etc/hosts | 0 .../{rootcopy => rootcopy-install}/etc/issue | 0 .../etc/localtime | 0 .../{rootcopy => rootcopy-install}/etc/motd | 0 .../etc/profile | 0 .../etc/skel/.bashrc | 0 .../etc/ssh/sshd_config.d/90-minios.conf | 0 .../etc/timezone | 0 .../home/live/.bashrc | 0 .../root/.bashrc | 0 .../usr/bin/dir2sb | 0 .../usr/bin/genminiosiso | 0 .../usr/bin/pxe | 0 .../usr/bin/rmsbdir | 0 .../usr/bin/savechanges | 6 +++- .../{rootcopy => rootcopy-install}/usr/bin/sb | 0 .../usr/bin/sb2dir | 0 .../usr/bin/slax | 0 .../usr/lib/systemd/system/apparmor.service | 0 .../usr/lib/systemd/system/getty@.service | 0 .../usr/lib/systemd/system/ssh.service | 0 .../lib/udev/rules.d/90-slax-automount.rules | 0 .../usr/sbin/gtk-bookmarks-update | 0 .../usr/sbin/slax-automount | 0 linux-live/buildconfig | 16 +++++---- linux-live/minioslib | 32 +++++++++--------- linux-live/modules/02-xorg/postinstall | 2 +- .../etc/skel/.Xresources | 0 .../etc/skel/.blackbox-menu | 0 .../etc/skel/.blackboxrc | 0 .../etc/skel/.xinitrc | 0 .../systemd/system/display-manager.service | 0 .../home/live/.Xresources | 0 .../home/live/.blackbox-menu | 0 .../home/live/.blackboxrc | 0 .../home/live/.xinitrc | 0 .../root/.Xresources | 0 .../root/.blackbox-menu | 0 .../root/.blackboxrc | 0 .../root/.xinitrc | 0 .../usr/lib/systemd/system/xorg.service | 0 .../usr/share/blackbox/styles/Slax | 0 .../share/icons/locolor/16x16/apps/xterm.xbm | 0 .../modules/03-xfce-desktop/postinstall | 2 +- .../etc/default/nodm | 0 .../etc/skel/.config/xarchiver/xarchiverrc | 0 .../skel/.config/xfce4/panel/battery-10.rc | 0 .../panel/launcher-3/TerminalEmulator.desktop | 0 .../panel/launcher-4/FileManager.desktop | 0 .../xfce4/panel/launcher-5/WebBrowser.desktop | 0 .../xfce-perchannel-xml/xfce4-appfinder.xml | 0 .../xfce-perchannel-xml/xfce4-desktop.xml | 0 .../xfce4-keyboard-shortcuts.xml | 0 .../xfce-perchannel-xml/xfce4-panel.xml | 0 .../xfce-perchannel-xml/xfce4-session.xml | 0 .../xfce4-settings-manager.xml | 0 .../xfconf/xfce-perchannel-xml/xfwm4.xml | 0 .../xfconf/xfce-perchannel-xml/xsettings.xml | 0 .../etc/skel/.xinitrc | 0 .../etc/skel/.xsession | 0 .../live/.config/chromium/Default/Preferences | 0 .../home/live/.config/chromium/First Run | 0 .../home/live/.config/xarchiver/xarchiverrc | 0 .../live/.config/xfce4/panel/battery-10.rc | 0 .../panel/launcher-3/TerminalEmulator.desktop | 0 .../panel/launcher-4/FileManager.desktop | 0 .../xfce4/panel/launcher-5/WebBrowser.desktop | 0 .../live/.config/xfce4/panel/whiskermenu-1.rc | 0 .../xfconf/xfce-perchannel-xml/displays.xml | 0 .../xfce-perchannel-xml/xfce4-appfinder.xml | 0 .../xfce-perchannel-xml/xfce4-desktop.xml | 0 .../xfce4-keyboard-shortcuts.xml | 0 .../xfce-perchannel-xml/xfce4-panel.xml | 0 .../xfce-perchannel-xml/xfce4-session.xml | 0 .../xfce4-settings-manager.xml | 0 .../xfconf/xfce-perchannel-xml/xfwm4.xml | 0 .../xfconf/xfce-perchannel-xml/xsettings.xml | 0 .../home/live/.xinitrc | 0 .../home/live/.xsession | 0 .../root/.config/xarchiver/xarchiverrc | 0 .../root/.config/xfce4/panel/battery-10.rc | 0 .../panel/launcher-3/TerminalEmulator.desktop | 0 .../panel/launcher-4/FileManager.desktop | 0 .../xfce4/panel/launcher-5/WebBrowser.desktop | 0 .../xfce-perchannel-xml/xfce4-appfinder.xml | 0 .../xfce-perchannel-xml/xfce4-desktop.xml | 0 .../xfce4-keyboard-shortcuts.xml | 0 .../xfce-perchannel-xml/xfce4-panel.xml | 0 .../xfce-perchannel-xml/xfce4-session.xml | 0 .../xfce4-settings-manager.xml | 0 .../xfconf/xfce-perchannel-xml/xfwm4.xml | 0 .../xfconf/xfce-perchannel-xml/xsettings.xml | 0 .../root/.xinitrc | 0 .../root/.xsession | 0 .../share/backgrounds/MiniOS-wallpaper.svg | 0 .../usr/share/pixmaps/MiniOS-white.svg | 0 .../share/slim/themes/minios/background.png | Bin .../usr/share/slim/themes/minios/panel.png | Bin .../usr/share/slim/themes/minios/slim.theme | 0 linux-live/modules/04-xfce-apps/postinstall | 2 +- .../skel/.config/autostart/volumeicon.desktop | 0 .../etc/skel/.config/volumeicon/volumeicon | 0 .../skel/.config/xfce4/terminal/accels.scm | 0 .../skel/.config/xfce4/terminal/terminalrc | 0 .../live/.config/autostart/volumeicon.desktop | 0 .../home/live/.config/volumeicon/volumeicon | 0 .../live/.config/xfce4/terminal/accels.scm | 0 .../live/.config/xfce4/terminal/terminalrc | 0 .../root/.config/autostart/volumeicon.desktop | 0 .../root/.config/volumeicon/volumeicon | 0 .../root/.config/xfce4/terminal/accels.scm | 0 .../root/.config/xfce4/terminal/terminalrc | 0 .../gnome/16x16/places/folder-documents.png | Bin .../gnome/16x16/places/folder-download.png | Bin .../icons/gnome/16x16/places/folder-music.png | Bin .../gnome/16x16/places/folder-pictures.png | Bin .../gnome/16x16/places/folder-publicshare.png | Bin .../gnome/16x16/places/folder-remote.png | Bin .../16x16/places/folder-saved-search.png | Bin .../gnome/16x16/places/folder-templates.png | Bin .../gnome/16x16/places/folder-videos.png | Bin .../share/icons/gnome/16x16/places/folder.png | Bin .../gnome/16x16/places/user-bookmarks.png | Bin .../icons/gnome/16x16/places/user-desktop.png | Bin .../icons/gnome/16x16/places/user-home.png | Bin .../gnome/22x22/places/folder-documents.png | Bin .../gnome/22x22/places/folder-download.png | Bin .../icons/gnome/22x22/places/folder-music.png | Bin .../gnome/22x22/places/folder-pictures.png | Bin .../gnome/22x22/places/folder-publicshare.png | Bin .../gnome/22x22/places/folder-remote.png | Bin .../22x22/places/folder-saved-search.png | Bin .../gnome/22x22/places/folder-templates.png | Bin .../gnome/22x22/places/folder-videos.png | Bin .../share/icons/gnome/22x22/places/folder.png | Bin .../gnome/22x22/places/user-bookmarks.png | Bin .../icons/gnome/22x22/places/user-desktop.png | Bin .../icons/gnome/22x22/places/user-home.png | Bin .../gnome/24x24/places/folder-documents.png | Bin .../gnome/24x24/places/folder-download.png | Bin .../icons/gnome/24x24/places/folder-music.png | Bin .../gnome/24x24/places/folder-pictures.png | Bin .../gnome/24x24/places/folder-publicshare.png | Bin .../gnome/24x24/places/folder-remote.png | Bin .../24x24/places/folder-saved-search.png | Bin .../gnome/24x24/places/folder-templates.png | Bin .../gnome/24x24/places/folder-videos.png | Bin .../share/icons/gnome/24x24/places/folder.png | Bin .../gnome/24x24/places/user-bookmarks.png | Bin .../icons/gnome/24x24/places/user-desktop.png | Bin .../icons/gnome/24x24/places/user-home.png | Bin .../gnome/32x32/places/folder-documents.png | Bin .../gnome/32x32/places/folder-download.png | Bin .../icons/gnome/32x32/places/folder-music.png | Bin .../gnome/32x32/places/folder-pictures.png | Bin .../gnome/32x32/places/folder-publicshare.png | Bin .../gnome/32x32/places/folder-remote.png | Bin .../32x32/places/folder-saved-search.png | Bin .../gnome/32x32/places/folder-templates.png | Bin .../gnome/32x32/places/folder-videos.png | Bin .../share/icons/gnome/32x32/places/folder.png | Bin .../gnome/32x32/places/user-bookmarks.png | Bin .../icons/gnome/32x32/places/user-desktop.png | Bin .../icons/gnome/32x32/places/user-home.png | Bin .../gnome/48x48/places/folder-documents.png | Bin .../gnome/48x48/places/folder-download.png | Bin .../icons/gnome/48x48/places/folder-music.png | Bin .../gnome/48x48/places/folder-pictures.png | Bin .../gnome/48x48/places/folder-publicshare.png | Bin .../gnome/48x48/places/folder-remote.png | Bin .../48x48/places/folder-saved-search.png | Bin .../gnome/48x48/places/folder-templates.png | Bin .../gnome/48x48/places/folder-videos.png | Bin .../share/icons/gnome/48x48/places/folder.png | Bin .../gnome/48x48/places/user-bookmarks.png | Bin .../icons/gnome/48x48/places/user-desktop.png | Bin .../icons/gnome/48x48/places/user-home.png | Bin .../icons/hicolor/128x128/apps/calculator.png | Bin .../icons/hicolor/128x128/apps/editor.png | Bin .../128x128/apps/system-file-manager.png | Bin .../16x16/apps/system-file-manager.png | Bin .../24x24/apps/system-file-manager.png | Bin .../32x32/apps/system-file-manager.png | Bin .../48x48/apps/system-file-manager.png | Bin .../icons/hicolor/64x64/apps/calculator.png | Bin .../64x64/apps/gnome_network_workgroup.png | Bin .../share/icons/hicolor/64x64/apps/medit.png | Bin .../64x64/apps/system-file-manager.png | Bin .../64x64/apps/utilities-system-monitor.png | Bin .../usr/share/pixmaps/qalculate.png | Bin minios-modules/etc/minios/config | 2 +- minios-modules/usr/lib/minioslib | 12 +++---- 195 files changed, 41 insertions(+), 33 deletions(-) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/etc/adjtime (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/etc/apt/apt.conf.d/000Slax (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/etc/hostname (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/etc/hosts (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/etc/issue (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/etc/localtime (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/etc/motd (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/etc/profile (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/etc/skel/.bashrc (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/etc/ssh/sshd_config.d/90-minios.conf (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/etc/timezone (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/home/live/.bashrc (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/root/.bashrc (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/bin/dir2sb (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/bin/genminiosiso (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/bin/pxe (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/bin/rmsbdir (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/bin/savechanges (91%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/bin/sb (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/bin/sb2dir (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/bin/slax (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/lib/systemd/system/apparmor.service (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/lib/systemd/system/getty@.service (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/lib/systemd/system/ssh.service (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/lib/udev/rules.d/90-slax-automount.rules (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/sbin/gtk-bookmarks-update (100%) rename linux-live/basesystem/01-core/{rootcopy => rootcopy-install}/usr/sbin/slax-automount (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/etc/skel/.Xresources (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/etc/skel/.blackbox-menu (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/etc/skel/.blackboxrc (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/etc/skel/.xinitrc (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/etc/systemd/system/display-manager.service (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/home/live/.Xresources (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/home/live/.blackbox-menu (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/home/live/.blackboxrc (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/home/live/.xinitrc (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/root/.Xresources (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/root/.blackbox-menu (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/root/.blackboxrc (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/root/.xinitrc (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/usr/lib/systemd/system/xorg.service (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/usr/share/blackbox/styles/Slax (100%) rename linux-live/modules/02-xorg/{rootcopy => rootcopy-install}/usr/share/icons/locolor/16x16/apps/xterm.xbm (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/default/nodm (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xarchiver/xarchiverrc (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/panel/battery-10.rc (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.xinitrc (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/etc/skel/.xsession (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/chromium/Default/Preferences (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/chromium/First Run (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xarchiver/xarchiverrc (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/panel/battery-10.rc (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/panel/launcher-4/FileManager.desktop (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/panel/launcher-5/WebBrowser.desktop (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/panel/whiskermenu-1.rc (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.xinitrc (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/home/live/.xsession (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xarchiver/xarchiverrc (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xfce4/panel/battery-10.rc (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xfce4/panel/launcher-4/FileManager.desktop (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xfce4/panel/launcher-5/WebBrowser.desktop (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.xinitrc (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/root/.xsession (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/usr/share/backgrounds/MiniOS-wallpaper.svg (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/usr/share/pixmaps/MiniOS-white.svg (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/usr/share/slim/themes/minios/background.png (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/usr/share/slim/themes/minios/panel.png (100%) rename linux-live/modules/03-xfce-desktop/{rootcopy => rootcopy-install}/usr/share/slim/themes/minios/slim.theme (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/etc/skel/.config/autostart/volumeicon.desktop (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/etc/skel/.config/volumeicon/volumeicon (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/terminal/accels.scm (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/etc/skel/.config/xfce4/terminal/terminalrc (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/home/live/.config/autostart/volumeicon.desktop (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/home/live/.config/volumeicon/volumeicon (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/home/live/.config/xfce4/terminal/accels.scm (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/home/live/.config/xfce4/terminal/terminalrc (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/root/.config/autostart/volumeicon.desktop (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/root/.config/volumeicon/volumeicon (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/root/.config/xfce4/terminal/accels.scm (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/root/.config/xfce4/terminal/terminalrc (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/folder-documents.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/folder-download.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/folder-music.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/folder-pictures.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/folder-publicshare.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/folder-remote.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/folder-saved-search.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/folder-templates.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/folder-videos.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/folder.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/user-bookmarks.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/user-desktop.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/16x16/places/user-home.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/folder-documents.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/folder-download.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/folder-music.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/folder-pictures.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/folder-publicshare.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/folder-remote.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/folder-saved-search.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/folder-templates.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/folder-videos.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/folder.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/user-bookmarks.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/user-desktop.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/22x22/places/user-home.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/folder-documents.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/folder-download.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/folder-music.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/folder-pictures.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/folder-publicshare.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/folder-remote.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/folder-saved-search.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/folder-templates.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/folder-videos.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/folder.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/user-bookmarks.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/user-desktop.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/24x24/places/user-home.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/folder-documents.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/folder-download.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/folder-music.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/folder-pictures.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/folder-publicshare.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/folder-remote.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/folder-saved-search.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/folder-templates.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/folder-videos.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/folder.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/user-bookmarks.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/user-desktop.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/32x32/places/user-home.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/folder-documents.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/folder-download.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/folder-music.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/folder-pictures.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/folder-publicshare.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/folder-remote.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/folder-saved-search.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/folder-templates.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/folder-videos.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/folder.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/user-bookmarks.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/user-desktop.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/gnome/48x48/places/user-home.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/hicolor/128x128/apps/calculator.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/hicolor/128x128/apps/editor.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/hicolor/128x128/apps/system-file-manager.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/hicolor/16x16/apps/system-file-manager.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/hicolor/24x24/apps/system-file-manager.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/hicolor/32x32/apps/system-file-manager.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/hicolor/48x48/apps/system-file-manager.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/hicolor/64x64/apps/calculator.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/hicolor/64x64/apps/medit.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/hicolor/64x64/apps/system-file-manager.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png (100%) rename linux-live/modules/04-xfce-apps/{rootcopy => rootcopy-install}/usr/share/pixmaps/qalculate.png (100%) diff --git a/linux-live/basesystem/01-core/rootcopy/etc/adjtime b/linux-live/basesystem/01-core/rootcopy-install/etc/adjtime similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/etc/adjtime rename to linux-live/basesystem/01-core/rootcopy-install/etc/adjtime diff --git a/linux-live/basesystem/01-core/rootcopy/etc/apt/apt.conf.d/000Slax b/linux-live/basesystem/01-core/rootcopy-install/etc/apt/apt.conf.d/000Slax similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/etc/apt/apt.conf.d/000Slax rename to linux-live/basesystem/01-core/rootcopy-install/etc/apt/apt.conf.d/000Slax diff --git a/linux-live/basesystem/01-core/rootcopy/etc/hostname b/linux-live/basesystem/01-core/rootcopy-install/etc/hostname similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/etc/hostname rename to linux-live/basesystem/01-core/rootcopy-install/etc/hostname diff --git a/linux-live/basesystem/01-core/rootcopy/etc/hosts b/linux-live/basesystem/01-core/rootcopy-install/etc/hosts similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/etc/hosts rename to linux-live/basesystem/01-core/rootcopy-install/etc/hosts diff --git a/linux-live/basesystem/01-core/rootcopy/etc/issue b/linux-live/basesystem/01-core/rootcopy-install/etc/issue similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/etc/issue rename to linux-live/basesystem/01-core/rootcopy-install/etc/issue diff --git a/linux-live/basesystem/01-core/rootcopy/etc/localtime b/linux-live/basesystem/01-core/rootcopy-install/etc/localtime similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/etc/localtime rename to linux-live/basesystem/01-core/rootcopy-install/etc/localtime diff --git a/linux-live/basesystem/01-core/rootcopy/etc/motd b/linux-live/basesystem/01-core/rootcopy-install/etc/motd similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/etc/motd rename to linux-live/basesystem/01-core/rootcopy-install/etc/motd diff --git a/linux-live/basesystem/01-core/rootcopy/etc/profile b/linux-live/basesystem/01-core/rootcopy-install/etc/profile similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/etc/profile rename to linux-live/basesystem/01-core/rootcopy-install/etc/profile diff --git a/linux-live/basesystem/01-core/rootcopy/etc/skel/.bashrc b/linux-live/basesystem/01-core/rootcopy-install/etc/skel/.bashrc similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/etc/skel/.bashrc rename to linux-live/basesystem/01-core/rootcopy-install/etc/skel/.bashrc diff --git a/linux-live/basesystem/01-core/rootcopy/etc/ssh/sshd_config.d/90-minios.conf b/linux-live/basesystem/01-core/rootcopy-install/etc/ssh/sshd_config.d/90-minios.conf similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/etc/ssh/sshd_config.d/90-minios.conf rename to linux-live/basesystem/01-core/rootcopy-install/etc/ssh/sshd_config.d/90-minios.conf diff --git a/linux-live/basesystem/01-core/rootcopy/etc/timezone b/linux-live/basesystem/01-core/rootcopy-install/etc/timezone similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/etc/timezone rename to linux-live/basesystem/01-core/rootcopy-install/etc/timezone diff --git a/linux-live/basesystem/01-core/rootcopy/home/live/.bashrc b/linux-live/basesystem/01-core/rootcopy-install/home/live/.bashrc similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/home/live/.bashrc rename to linux-live/basesystem/01-core/rootcopy-install/home/live/.bashrc diff --git a/linux-live/basesystem/01-core/rootcopy/root/.bashrc b/linux-live/basesystem/01-core/rootcopy-install/root/.bashrc similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/root/.bashrc rename to linux-live/basesystem/01-core/rootcopy-install/root/.bashrc diff --git a/linux-live/basesystem/01-core/rootcopy/usr/bin/dir2sb b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/dir2sb similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/bin/dir2sb rename to linux-live/basesystem/01-core/rootcopy-install/usr/bin/dir2sb diff --git a/linux-live/basesystem/01-core/rootcopy/usr/bin/genminiosiso b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/genminiosiso similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/bin/genminiosiso rename to linux-live/basesystem/01-core/rootcopy-install/usr/bin/genminiosiso diff --git a/linux-live/basesystem/01-core/rootcopy/usr/bin/pxe b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/pxe similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/bin/pxe rename to linux-live/basesystem/01-core/rootcopy-install/usr/bin/pxe diff --git a/linux-live/basesystem/01-core/rootcopy/usr/bin/rmsbdir b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/rmsbdir similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/bin/rmsbdir rename to linux-live/basesystem/01-core/rootcopy-install/usr/bin/rmsbdir diff --git a/linux-live/basesystem/01-core/rootcopy/usr/bin/savechanges b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/savechanges similarity index 91% rename from linux-live/basesystem/01-core/rootcopy/usr/bin/savechanges rename to linux-live/basesystem/01-core/rootcopy-install/usr/bin/savechanges index 7c64e42..9eb812a 100755 --- a/linux-live/basesystem/01-core/rootcopy/usr/bin/savechanges +++ b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/savechanges @@ -8,7 +8,11 @@ fi TMP=/tmp/changes$$ EXCLUDE="^\$|/\$|[.]wh[.][.]wh[.]orph/|^[.]wh[.][.]wh[.]plnk/|^[.]wh[.][.]wh[.]aufs|^var/cache/|^var/backups/|^var/tmp/|^var/log/|^var/lib/apt/|^var/lib/dhcp/|^var/lib/systemd/|^sbin/fsck[.]aufs|^etc/resolv[.]conf|^root/[.]Xauthority|^root/[.]xsession-errors|^root/[.]fehbg|^root/[.]fluxbox/lastwallpaper|^root/[.]fluxbox/menu_resolution|^etc/mtab|^etc/fstab|^boot/|^dev/|^mnt/|^proc/|^run/|^sys/|^tmp/" -CHANGES=/run/initramfs/memory/changes +if [ -d /run/initramfs/memory/changes/changes ]; then + CHANGES=/run/initramfs/memory/changes/changes +else + CHANGES=/run/initramfs/memory/changes +fi if [ "$1" = "" ]; then echo "" diff --git a/linux-live/basesystem/01-core/rootcopy/usr/bin/sb b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/sb similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/bin/sb rename to linux-live/basesystem/01-core/rootcopy-install/usr/bin/sb diff --git a/linux-live/basesystem/01-core/rootcopy/usr/bin/sb2dir b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/sb2dir similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/bin/sb2dir rename to linux-live/basesystem/01-core/rootcopy-install/usr/bin/sb2dir diff --git a/linux-live/basesystem/01-core/rootcopy/usr/bin/slax b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/slax similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/bin/slax rename to linux-live/basesystem/01-core/rootcopy-install/usr/bin/slax diff --git a/linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/apparmor.service b/linux-live/basesystem/01-core/rootcopy-install/usr/lib/systemd/system/apparmor.service similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/apparmor.service rename to linux-live/basesystem/01-core/rootcopy-install/usr/lib/systemd/system/apparmor.service diff --git a/linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/getty@.service b/linux-live/basesystem/01-core/rootcopy-install/usr/lib/systemd/system/getty@.service similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/getty@.service rename to linux-live/basesystem/01-core/rootcopy-install/usr/lib/systemd/system/getty@.service diff --git a/linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/ssh.service b/linux-live/basesystem/01-core/rootcopy-install/usr/lib/systemd/system/ssh.service similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/ssh.service rename to linux-live/basesystem/01-core/rootcopy-install/usr/lib/systemd/system/ssh.service diff --git a/linux-live/basesystem/01-core/rootcopy/usr/lib/udev/rules.d/90-slax-automount.rules b/linux-live/basesystem/01-core/rootcopy-install/usr/lib/udev/rules.d/90-slax-automount.rules similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/lib/udev/rules.d/90-slax-automount.rules rename to linux-live/basesystem/01-core/rootcopy-install/usr/lib/udev/rules.d/90-slax-automount.rules diff --git a/linux-live/basesystem/01-core/rootcopy/usr/sbin/gtk-bookmarks-update b/linux-live/basesystem/01-core/rootcopy-install/usr/sbin/gtk-bookmarks-update similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/sbin/gtk-bookmarks-update rename to linux-live/basesystem/01-core/rootcopy-install/usr/sbin/gtk-bookmarks-update diff --git a/linux-live/basesystem/01-core/rootcopy/usr/sbin/slax-automount b/linux-live/basesystem/01-core/rootcopy-install/usr/sbin/slax-automount similarity index 100% rename from linux-live/basesystem/01-core/rootcopy/usr/sbin/slax-automount rename to linux-live/basesystem/01-core/rootcopy-install/usr/sbin/slax-automount diff --git a/linux-live/buildconfig b/linux-live/buildconfig index cdf1294..4b4dc58 100644 --- a/linux-live/buildconfig +++ b/linux-live/buildconfig @@ -1,15 +1,19 @@ #!/bin/bash -# +# distribution type +# тип дистрибутива DISTRIBUTION_TYPE="debian" -# -DISTRIBUTION="buster" +# distribution +# дистрибутив +DISTRIBUTION="bullseye" -# -DISTRIBUTION_ARCH="i386" +# distribution arch +# архитектура дистрибутива +DISTRIBUTION_ARCH="amd64" -# Used when building Ubuntu +# bootstrap variant (used to build Ubuntu) +# вариант bootstrap (используется для сборки Ubuntu) DISTRIBUTION_VARIANT="minbase" # diff --git a/linux-live/minioslib b/linux-live/minioslib index e10982c..7b9d55e 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -839,7 +839,7 @@ function chroot_build_cleanup() { rm -f /cleanup >>$OUTPUT 2>&1 rm -f /$PACKAGE_VARIANT.list >>$OUTPUT 2>&1 rm -f /postinstall >>$OUTPUT 2>&1 - rm -rf /rootcopy >>$OUTPUT 2>&1 + rm -rf /rootcopy-install >>$OUTPUT 2>&1 rm -rf /patches >>$OUTPUT 2>&1 rm -f /etc/fstab >>$OUTPUT 2>&1 @@ -985,8 +985,8 @@ function main_pkg_list() { PACKAGE_VARIANT=$PACKAGE_VARIANT \ /linux-live/basesystem/01-core/preinstall fi - : ' if [ "$(ls -A /linux-live/basesystem/01-core/rootcopy)" != "" ]; then - (cd /linux-live/basesystem/01-core/rootcopy && cp --parents -afr * /) + : ' if [ "$(ls -A /linux-live/basesystem/01-core/rootcopy-install)" != "" ]; then + (cd /linux-live/basesystem/01-core/rootcopy-install && cp --parents -afr * /) fi' if [ -f /linux-live/basesystem/01-core/install ]; then chmod +x /linux-live/basesystem/01-core/install @@ -1058,7 +1058,7 @@ function chroot_configure() { #addgroup live live >>$OUTPUT 2>&1 usermod -a -G sudo live - (cd /linux-live/basesystem/01-core/rootcopy && cp --parents -afr * /) + (cd /linux-live/basesystem/01-core/rootcopy-install && cp --parents -afr * /) chown live:live /home/live chown -R live:live /home/live @@ -1505,7 +1505,7 @@ function module_chroot_cleanup() { rm -f $MODULE_UPPER_DIR/cleanup >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1 - rm -rf $MODULE_UPPER_DIR/rootcopy >>$OUTPUT 2>&1 + rm -rf $MODULE_UPPER_DIR/rootcopy-install >>$OUTPUT 2>&1 fi } @@ -1619,7 +1619,7 @@ function module_build_cleanup() { rm -f $MODULE_UPPER_DIR/cleanup >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1 - rm -rf $MODULE_UPPER_DIR/rootcopy >>$OUTPUT 2>&1 + rm -rf $MODULE_UPPER_DIR/rootcopy-install >>$OUTPUT 2>&1 rm -rf $MODULE_UPPER_DIR/patches >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/etc/fstab >>$OUTPUT 2>&1 @@ -1765,24 +1765,24 @@ function build_modules() { # copy files if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ]; then - (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/) + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ]; then + (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/) fi else - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ] >>$OUTPUT 2>&1; then - (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/) + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then + (cd $SCRIPT_DIR/linux-live/modules/$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/$MODULE/rootcopy)" != "" ]; then - mkdir $MODULE_MERGED_DIR/rootcopy - (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy/) + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ]; then + mkdir $MODULE_MERGED_DIR/rootcopy-install + (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/) fi else - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ] >>$OUTPUT 2>&1; then - mkdir $MODULE_MERGED_DIR/rootcopy - (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy/) + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then + mkdir $MODULE_MERGED_DIR/rootcopy-install + (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/) fi fi fi diff --git a/linux-live/modules/02-xorg/postinstall b/linux-live/modules/02-xorg/postinstall index 1a1269a..175edef 100644 --- a/linux-live/modules/02-xorg/postinstall +++ b/linux-live/modules/02-xorg/postinstall @@ -9,7 +9,7 @@ chmod u+s /usr/lib/xorg/Xorg rm -Rf /usr/share/icons/breeze_cursors >>$OUTPUT 2>&1 mv /usr/share/icons/Breeze_Snow /usr/share/icons/breeze_cursors >>$OUTPUT 2>&1 -(cd /rootcopy && cp --parents -afr * /) +(cd /rootcopy-install && cp --parents -afr * /) # install x11 server utils, apt-get would add cpp dependency, bullshit! cd /tmp diff --git a/linux-live/modules/02-xorg/rootcopy/etc/skel/.Xresources b/linux-live/modules/02-xorg/rootcopy-install/etc/skel/.Xresources similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/etc/skel/.Xresources rename to linux-live/modules/02-xorg/rootcopy-install/etc/skel/.Xresources diff --git a/linux-live/modules/02-xorg/rootcopy/etc/skel/.blackbox-menu b/linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackbox-menu similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/etc/skel/.blackbox-menu rename to linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackbox-menu diff --git a/linux-live/modules/02-xorg/rootcopy/etc/skel/.blackboxrc b/linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackboxrc similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/etc/skel/.blackboxrc rename to linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackboxrc diff --git a/linux-live/modules/02-xorg/rootcopy/etc/skel/.xinitrc b/linux-live/modules/02-xorg/rootcopy-install/etc/skel/.xinitrc similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/etc/skel/.xinitrc rename to linux-live/modules/02-xorg/rootcopy-install/etc/skel/.xinitrc diff --git a/linux-live/modules/02-xorg/rootcopy/etc/systemd/system/display-manager.service b/linux-live/modules/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/etc/systemd/system/display-manager.service rename to linux-live/modules/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service diff --git a/linux-live/modules/02-xorg/rootcopy/home/live/.Xresources b/linux-live/modules/02-xorg/rootcopy-install/home/live/.Xresources similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/home/live/.Xresources rename to linux-live/modules/02-xorg/rootcopy-install/home/live/.Xresources diff --git a/linux-live/modules/02-xorg/rootcopy/home/live/.blackbox-menu b/linux-live/modules/02-xorg/rootcopy-install/home/live/.blackbox-menu similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/home/live/.blackbox-menu rename to linux-live/modules/02-xorg/rootcopy-install/home/live/.blackbox-menu diff --git a/linux-live/modules/02-xorg/rootcopy/home/live/.blackboxrc b/linux-live/modules/02-xorg/rootcopy-install/home/live/.blackboxrc similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/home/live/.blackboxrc rename to linux-live/modules/02-xorg/rootcopy-install/home/live/.blackboxrc diff --git a/linux-live/modules/02-xorg/rootcopy/home/live/.xinitrc b/linux-live/modules/02-xorg/rootcopy-install/home/live/.xinitrc similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/home/live/.xinitrc rename to linux-live/modules/02-xorg/rootcopy-install/home/live/.xinitrc diff --git a/linux-live/modules/02-xorg/rootcopy/root/.Xresources b/linux-live/modules/02-xorg/rootcopy-install/root/.Xresources similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/root/.Xresources rename to linux-live/modules/02-xorg/rootcopy-install/root/.Xresources diff --git a/linux-live/modules/02-xorg/rootcopy/root/.blackbox-menu b/linux-live/modules/02-xorg/rootcopy-install/root/.blackbox-menu similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/root/.blackbox-menu rename to linux-live/modules/02-xorg/rootcopy-install/root/.blackbox-menu diff --git a/linux-live/modules/02-xorg/rootcopy/root/.blackboxrc b/linux-live/modules/02-xorg/rootcopy-install/root/.blackboxrc similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/root/.blackboxrc rename to linux-live/modules/02-xorg/rootcopy-install/root/.blackboxrc diff --git a/linux-live/modules/02-xorg/rootcopy/root/.xinitrc b/linux-live/modules/02-xorg/rootcopy-install/root/.xinitrc similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/root/.xinitrc rename to linux-live/modules/02-xorg/rootcopy-install/root/.xinitrc diff --git a/linux-live/modules/02-xorg/rootcopy/usr/lib/systemd/system/xorg.service b/linux-live/modules/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/usr/lib/systemd/system/xorg.service rename to linux-live/modules/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service diff --git a/linux-live/modules/02-xorg/rootcopy/usr/share/blackbox/styles/Slax b/linux-live/modules/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/usr/share/blackbox/styles/Slax rename to linux-live/modules/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax diff --git a/linux-live/modules/02-xorg/rootcopy/usr/share/icons/locolor/16x16/apps/xterm.xbm b/linux-live/modules/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm similarity index 100% rename from linux-live/modules/02-xorg/rootcopy/usr/share/icons/locolor/16x16/apps/xterm.xbm rename to linux-live/modules/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm diff --git a/linux-live/modules/03-xfce-desktop/postinstall b/linux-live/modules/03-xfce-desktop/postinstall index b72f284..175d74a 100644 --- a/linux-live/modules/03-xfce-desktop/postinstall +++ b/linux-live/modules/03-xfce-desktop/postinstall @@ -1,6 +1,6 @@ #!/bin/bash -#(cd /rootcopy && cp --parents -afr * /) +#(cd /rootcopy-install && cp --parents -afr * /) # create user directories for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/default/nodm b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/default/nodm similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/default/nodm rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/default/nodm diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xarchiver/xarchiverrc b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xarchiver/xarchiverrc rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/battery-10.rc b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/battery-10.rc rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/linux-live/modules/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/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/linux-live/modules/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/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.xinitrc b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.xinitrc rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.xsession b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xsession similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.xsession rename to linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xsession diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/chromium/Default/Preferences b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/Default/Preferences similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/chromium/Default/Preferences rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/Default/Preferences diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/chromium/First Run b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/First Run similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/chromium/First Run rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/First Run diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xarchiver/xarchiverrc b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xarchiver/xarchiverrc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xarchiver/xarchiverrc rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xarchiver/xarchiverrc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/battery-10.rc b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/battery-10.rc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/battery-10.rc rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/battery-10.rc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/launcher-4/FileManager.desktop b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-4/FileManager.desktop similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/launcher-4/FileManager.desktop rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-4/FileManager.desktop diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/launcher-5/WebBrowser.desktop b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-5/WebBrowser.desktop similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/launcher-5/WebBrowser.desktop rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-5/WebBrowser.desktop diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/whiskermenu-1.rc b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/whiskermenu-1.rc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/whiskermenu-1.rc rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/whiskermenu-1.rc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.xinitrc b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.xinitrc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.xinitrc rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.xinitrc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.xsession b/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.xsession similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/home/live/.xsession rename to linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.xsession diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xarchiver/xarchiverrc b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xarchiver/xarchiverrc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xarchiver/xarchiverrc rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xarchiver/xarchiverrc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/battery-10.rc b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/battery-10.rc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/battery-10.rc rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/battery-10.rc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/launcher-4/FileManager.desktop b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-4/FileManager.desktop similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/launcher-4/FileManager.desktop rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-4/FileManager.desktop diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/launcher-5/WebBrowser.desktop b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-5/WebBrowser.desktop similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/launcher-5/WebBrowser.desktop rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-5/WebBrowser.desktop diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.xinitrc b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.xinitrc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.xinitrc rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.xinitrc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.xsession b/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.xsession similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/root/.xsession rename to linux-live/modules/03-xfce-desktop/rootcopy-install/root/.xsession diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/usr/share/backgrounds/MiniOS-wallpaper.svg b/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/usr/share/backgrounds/MiniOS-wallpaper.svg rename to linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/usr/share/pixmaps/MiniOS-white.svg b/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/usr/share/pixmaps/MiniOS-white.svg rename to linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/usr/share/slim/themes/minios/background.png b/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/usr/share/slim/themes/minios/background.png rename to linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/usr/share/slim/themes/minios/panel.png b/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/usr/share/slim/themes/minios/panel.png rename to linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/usr/share/slim/themes/minios/slim.theme b/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy/usr/share/slim/themes/minios/slim.theme rename to linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme diff --git a/linux-live/modules/04-xfce-apps/postinstall b/linux-live/modules/04-xfce-apps/postinstall index 6430bf2..fd06000 100644 --- a/linux-live/modules/04-xfce-apps/postinstall +++ b/linux-live/modules/04-xfce-apps/postinstall @@ -1,6 +1,6 @@ #!/bin/bash -(cd /rootcopy && cp --parents -afr * /) +(cd /rootcopy-install && cp --parents -afr * /) if [ $PACKAGE_VARIANT = "minimal" ]; then sed -i 's,create=xarchiver --add-to,create=xarchiver --compress,g' /usr/share/libfm/archivers.list diff --git a/linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/autostart/volumeicon.desktop b/linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/autostart/volumeicon.desktop rename to linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop diff --git a/linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/volumeicon/volumeicon b/linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/volumeicon/volumeicon rename to linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon diff --git a/linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/xfce4/terminal/accels.scm b/linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/xfce4/terminal/accels.scm rename to linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm diff --git a/linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/xfce4/terminal/terminalrc b/linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/xfce4/terminal/terminalrc rename to linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc diff --git a/linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/autostart/volumeicon.desktop b/linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/autostart/volumeicon.desktop similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/autostart/volumeicon.desktop rename to linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/autostart/volumeicon.desktop diff --git a/linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/volumeicon/volumeicon b/linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/volumeicon/volumeicon similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/volumeicon/volumeicon rename to linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/volumeicon/volumeicon diff --git a/linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/xfce4/terminal/accels.scm b/linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/accels.scm similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/xfce4/terminal/accels.scm rename to linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/accels.scm diff --git a/linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/xfce4/terminal/terminalrc b/linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/terminalrc similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/xfce4/terminal/terminalrc rename to linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/terminalrc diff --git a/linux-live/modules/04-xfce-apps/rootcopy/root/.config/autostart/volumeicon.desktop b/linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/autostart/volumeicon.desktop similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/root/.config/autostart/volumeicon.desktop rename to linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/autostart/volumeicon.desktop diff --git a/linux-live/modules/04-xfce-apps/rootcopy/root/.config/volumeicon/volumeicon b/linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/volumeicon/volumeicon similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/root/.config/volumeicon/volumeicon rename to linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/volumeicon/volumeicon diff --git a/linux-live/modules/04-xfce-apps/rootcopy/root/.config/xfce4/terminal/accels.scm b/linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/xfce4/terminal/accels.scm similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/root/.config/xfce4/terminal/accels.scm rename to linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/xfce4/terminal/accels.scm diff --git a/linux-live/modules/04-xfce-apps/rootcopy/root/.config/xfce4/terminal/terminalrc b/linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/xfce4/terminal/terminalrc similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/root/.config/xfce4/terminal/terminalrc rename to linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/xfce4/terminal/terminalrc diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-documents.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-documents.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-download.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-download.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-music.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-music.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-pictures.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-pictures.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-publicshare.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-publicshare.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-remote.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-remote.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-saved-search.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-saved-search.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-templates.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-templates.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-videos.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-videos.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-bookmarks.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-bookmarks.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-desktop.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-desktop.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-home.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-home.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-documents.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-documents.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-download.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-download.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-music.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-music.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-pictures.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-pictures.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-publicshare.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-publicshare.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-remote.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-remote.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-saved-search.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-saved-search.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-templates.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-templates.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-videos.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-videos.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-bookmarks.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-bookmarks.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-desktop.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-desktop.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-home.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-home.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-documents.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-documents.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-download.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-download.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-music.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-music.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-pictures.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-pictures.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-publicshare.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-publicshare.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-remote.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-remote.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-saved-search.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-saved-search.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-templates.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-templates.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-videos.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-videos.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-bookmarks.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-bookmarks.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-desktop.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-desktop.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-home.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-home.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-documents.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-documents.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-download.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-download.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-music.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-music.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-pictures.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-pictures.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-publicshare.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-publicshare.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-remote.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-remote.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-saved-search.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-saved-search.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-templates.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-templates.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-videos.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-videos.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-bookmarks.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-bookmarks.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-desktop.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-desktop.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-home.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-home.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-documents.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-documents.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-download.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-download.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-music.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-music.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-pictures.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-pictures.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-publicshare.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-publicshare.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-remote.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-remote.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-saved-search.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-saved-search.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-templates.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-templates.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-videos.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-videos.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-bookmarks.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-bookmarks.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-desktop.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-desktop.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-home.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-home.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/calculator.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/calculator.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/editor.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/editor.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/system-file-manager.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/system-file-manager.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/16x16/apps/system-file-manager.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/16x16/apps/system-file-manager.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/24x24/apps/system-file-manager.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/24x24/apps/system-file-manager.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/32x32/apps/system-file-manager.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/32x32/apps/system-file-manager.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/48x48/apps/system-file-manager.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/48x48/apps/system-file-manager.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/calculator.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/calculator.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/medit.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/medit.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/system-file-manager.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/system-file-manager.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/pixmaps/qalculate.png b/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/pixmaps/qalculate.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy/usr/share/pixmaps/qalculate.png rename to linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/pixmaps/qalculate.png diff --git a/minios-modules/etc/minios/config b/minios-modules/etc/minios/config index bfa19a8..282f642 100644 --- a/minios-modules/etc/minios/config +++ b/minios-modules/etc/minios/config @@ -40,7 +40,7 @@ APT_OPTIONS2="--no-install-recommends" UNION_BUILD_TYPE="overlayfs" -# +# Compression method used for the system and modules. COMP_TYPE="xz" # Kernel file, will be copied to your Live Kit diff --git a/minios-modules/usr/lib/minioslib b/minios-modules/usr/lib/minioslib index 0ee3e45..0b729e4 100644 --- a/minios-modules/usr/lib/minioslib +++ b/minios-modules/usr/lib/minioslib @@ -454,7 +454,7 @@ function module_build_cleanup() { rm -f $MODULE_UPPER_DIR/cleanup rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list rm -f $MODULE_UPPER_DIR/postinstall - rm -rf $MODULE_UPPER_DIR/rootcopy + rm -rf $MODULE_UPPER_DIR/rootcopy-install rm -rf $MODULE_UPPER_DIR/patches rm -f $MODULE_UPPER_DIR/etc/fstab @@ -549,7 +549,7 @@ function module_build_cleanup() { rm -f $MODULE_UPPER_DIR/cleanup >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1 - rm -rf $MODULE_UPPER_DIR/rootcopy >>$OUTPUT 2>&1 + rm -rf $MODULE_UPPER_DIR/rootcopy-install >>$OUTPUT 2>&1 rm -rf $MODULE_UPPER_DIR/patches >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/etc/fstab >>$OUTPUT 2>&1 @@ -682,12 +682,12 @@ function build_modules() { # copy files if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then - if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/rootcopy)" != "" ]; then - (cd $CURRENT_DIR/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/) + if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/rootcopy-install)" != "" ]; then + (cd $CURRENT_DIR/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/) fi else - if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/rootcopy)" != "" ] >>$OUTPUT 2>&1; then - (cd $CURRENT_DIR/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/) + if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then + (cd $CURRENT_DIR/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/) fi fi