From b9e5f1921f70660e0feb6b35b8791409339416f4 Mon Sep 17 00:00:00 2001 From: 2Shirt <1923621+2Shirt@users.noreply.github.com> Date: Tue, 12 Dec 2017 11:34:05 -0800 Subject: [PATCH] Reorganized include folders * include/live is "burned" into the sfs files during build-arch * include/iso is added to the iso folder before iso creation * Added --copy-archiso flag to Build Linux --- .linux_items/build-wk | 80 ------------------ .../local/bin => include/iso/arch}/arch.conf | 0 .../extra => include/iso}/arch/conky.rc | 0 .../local/bin => include/iso/arch}/wifi.conf | 0 .../live}/airootfs/etc/default/ufw | 0 .../live}/airootfs/etc/fstab | 0 .../live}/airootfs/etc/locale.conf | 0 .../live}/airootfs/etc/locale.gen | 0 .../live}/airootfs/etc/machine-id | 0 .../live}/airootfs/etc/motd | 0 .../live}/airootfs/etc/oblogout.conf | 0 .../polkit-1/rules.d/49-nopasswd_global.rules | 0 .../live}/airootfs/etc/skel/.Xresources | 0 .../live}/airootfs/etc/skel/.aliases | 0 .../live}/airootfs/etc/skel/.bash_logout | 0 .../live}/airootfs/etc/skel/.bash_profile | 0 .../live}/airootfs/etc/skel/.bashrc | 0 .../etc/skel/.config/Thunar/accels.scm | 0 .../airootfs/etc/skel/.config/Thunar/uca.xml | 0 .../airootfs/etc/skel/.config/dunst/dunstrc | 0 .../etc/skel/.config/gtk-3.0/settings.ini | 0 .../live}/airootfs/etc/skel/.config/i3/config | 0 .../airootfs/etc/skel/.config/i3status/config | 0 .../airootfs/etc/skel/.config/mimeapps.list | 0 .../etc/skel/.config/openbox/autostart | 0 .../etc/skel/.config/openbox/environment | 0 .../etc/skel/.config/openbox/menu.xml | 0 .../airootfs/etc/skel/.config/openbox/rc.xml | 0 .../airootfs/etc/skel/.config/rofi/config | 0 .../airootfs/etc/skel/.config/tint2/tint2rc | 0 .../live}/airootfs/etc/skel/.conky_start | 0 .../live}/airootfs/etc/skel/.conkyrc | 0 .../live}/airootfs/etc/skel/.dircolors | 0 .../skel/.gstreamer-0.10/registry.x86_64.bin | Bin .../live}/airootfs/etc/skel/.gtkrc-2.0 | 0 .../etc/skel/.local/share/notes/Notes/Notes | 0 .../etc/skel/.local/share/recently-used.xbel | 0 .../live}/airootfs/etc/skel/.network_start | 0 .../live}/airootfs/etc/skel/.rsync_exclusions | 0 .../live}/airootfs/etc/skel/.tmux.conf | 0 .../live}/airootfs/etc/skel/.update_conky | 0 .../live}/airootfs/etc/skel/.update_wallpaper | 0 .../airootfs/etc/skel/.urxvt_default_res | 0 .../live}/airootfs/etc/skel/.vimrc | 0 .../live}/airootfs/etc/skel/.xinitrc | 0 .../live}/airootfs/etc/skel/.zlogin | 0 .../live}/airootfs/etc/skel/.zshrc | 0 ...bus-org.freedesktop.NetworkManager.service | 0 ...dbus-org.freedesktop.nm-dispatcher.service | 0 .../systemd/system/display-manager.service | 0 .../getty.target.wants/getty@tty1.service | 0 .../getty@tty1.service.d/autologin.conf | 0 .../NetworkManager.service | 0 .../multi-user.target.wants/rngd.service | 0 .../multi-user.target.wants/sshd.service | 0 .../multi-user.target.wants/ufw.service | 0 .../etc/udev/rules.d/99-udisks2.rules | 0 .../live}/airootfs/etc/udevil/udevil.conf | 0 .../live}/airootfs/etc/ufw/after.init | 0 .../live}/airootfs/etc/ufw/after.rules | 0 .../live}/airootfs/etc/ufw/after6.rules | 0 .../etc/ufw/applications.d/ufw-bittorent | 0 .../airootfs/etc/ufw/applications.d/ufw-chat | 0 .../ufw/applications.d/ufw-directoryserver | 0 .../etc/ufw/applications.d/ufw-dnsserver | 0 .../etc/ufw/applications.d/ufw-fileserver | 0 .../etc/ufw/applications.d/ufw-loginserver | 0 .../etc/ufw/applications.d/ufw-mailserver | 0 .../etc/ufw/applications.d/ufw-printserver | 0 .../etc/ufw/applications.d/ufw-proxyserver | 0 .../etc/ufw/applications.d/ufw-webserver | 0 .../live}/airootfs/etc/ufw/before.init | 0 .../live}/airootfs/etc/ufw/before.rules | 0 .../live}/airootfs/etc/ufw/before6.rules | 0 .../live}/airootfs/etc/ufw/sysctl.conf | 0 .../live}/airootfs/etc/ufw/ufw.conf | 0 .../live}/airootfs/etc/ufw/user.rules | 0 .../live}/airootfs/etc/ufw/user6.rules | 0 .../live}/airootfs/etc/vconsole.conf | 0 .../airootfs/etc/xdg/xfce4/kiosk/kioskrc | 0 .../live}/airootfs/root/.automated_script.sh | 0 .../live}/airootfs/root/.zlogin | 0 .../live}/airootfs/root/customize_airootfs.sh | 0 .../live}/airootfs/root/install.txt | 0 .../live}/airootfs/usr/local/bin/apple_fans | 0 .../live/airootfs/usr/local/bin}/arch.conf | 0 .../airootfs/usr/local/bin/connect-to-network | 0 .../live}/airootfs/usr/local/bin/hw-diags | 0 .../airootfs/usr/local/bin/hw-diags-audio | 0 .../airootfs/usr/local/bin/hw-diags-badblocks | 0 .../airootfs/usr/local/bin/hw-diags-inner | 0 .../airootfs/usr/local/bin/hw-diags-network | 0 .../airootfs/usr/local/bin/hw-diags-prime95 | 0 .../airootfs/usr/local/bin/hw-diags-progress | 0 .../airootfs/usr/local/bin/hw-diags-sensors | 0 .../airootfs/usr/local/bin/mount-all-volumes | 0 .../usr/local/bin/mount-all-volumes-foh | 0 .../usr/local/bin/mount-backup-shares | 0 .../airootfs/usr/local/bin/msword-search | 0 .../live}/airootfs/usr/local/bin/remount-rw | 0 .../live/airootfs/usr/local/bin}/wifi.conf | 0 .../applications/Hardware Diagnostics.desktop | 0 .../applications/Hardware Information.desktop | 0 .../share/applications/NetworkTest.desktop | 0 .../usr/share/applications/SpeedTest.desktop | 0 .../live}/mkinitcpio.conf | 0 .../{archlive => include/live}/packages.both | 0 .../{archlive => include/live}/packages.i686 | 0 .../live}/packages.x86_64 | 0 .../{archlive => include/live}/pacman.conf | 0 Build Linux | 13 ++- 111 files changed, 10 insertions(+), 83 deletions(-) delete mode 100644 .linux_items/build-wk rename .linux_items/{archlive/airootfs/usr/local/bin => include/iso/arch}/arch.conf (100%) rename .linux_items/{archlive/extra => include/iso}/arch/conky.rc (100%) rename .linux_items/{archlive/airootfs/usr/local/bin => include/iso/arch}/wifi.conf (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/default/ufw (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/fstab (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/locale.conf (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/locale.gen (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/machine-id (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/motd (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/oblogout.conf (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.Xresources (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.aliases (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.bash_logout (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.bash_profile (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.bashrc (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/Thunar/accels.scm (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/Thunar/uca.xml (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/dunst/dunstrc (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/gtk-3.0/settings.ini (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/i3/config (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/i3status/config (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/mimeapps.list (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/openbox/autostart (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/openbox/environment (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/openbox/menu.xml (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/openbox/rc.xml (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/rofi/config (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.config/tint2/tint2rc (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.conky_start (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.conkyrc (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.dircolors (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.gstreamer-0.10/registry.x86_64.bin (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.gtkrc-2.0 (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.local/share/notes/Notes/Notes (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.local/share/recently-used.xbel (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.network_start (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.rsync_exclusions (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.tmux.conf (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.update_conky (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.update_wallpaper (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.urxvt_default_res (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.vimrc (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.xinitrc (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.zlogin (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/skel/.zshrc (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/systemd/system/display-manager.service (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/systemd/system/getty.target.wants/getty@tty1.service (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/udev/rules.d/99-udisks2.rules (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/udevil/udevil.conf (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/after.init (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/after.rules (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/after6.rules (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/applications.d/ufw-bittorent (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/applications.d/ufw-chat (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/applications.d/ufw-directoryserver (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/applications.d/ufw-dnsserver (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/applications.d/ufw-fileserver (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/applications.d/ufw-loginserver (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/applications.d/ufw-mailserver (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/applications.d/ufw-printserver (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/applications.d/ufw-proxyserver (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/applications.d/ufw-webserver (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/before.init (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/before.rules (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/before6.rules (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/sysctl.conf (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/ufw.conf (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/user.rules (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/ufw/user6.rules (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/vconsole.conf (100%) rename .linux_items/{archlive => include/live}/airootfs/etc/xdg/xfce4/kiosk/kioskrc (100%) rename .linux_items/{archlive => include/live}/airootfs/root/.automated_script.sh (100%) rename .linux_items/{archlive => include/live}/airootfs/root/.zlogin (100%) rename .linux_items/{archlive => include/live}/airootfs/root/customize_airootfs.sh (100%) rename .linux_items/{archlive => include/live}/airootfs/root/install.txt (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/apple_fans (100%) rename .linux_items/{archlive/extra/arch => include/live/airootfs/usr/local/bin}/arch.conf (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/connect-to-network (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/hw-diags (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/hw-diags-audio (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/hw-diags-badblocks (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/hw-diags-inner (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/hw-diags-network (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/hw-diags-prime95 (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/hw-diags-progress (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/hw-diags-sensors (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/mount-all-volumes (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/mount-all-volumes-foh (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/mount-backup-shares (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/msword-search (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/local/bin/remount-rw (100%) rename .linux_items/{archlive/extra/arch => include/live/airootfs/usr/local/bin}/wifi.conf (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/share/applications/Hardware Diagnostics.desktop (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/share/applications/Hardware Information.desktop (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/share/applications/NetworkTest.desktop (100%) rename .linux_items/{archlive => include/live}/airootfs/usr/share/applications/SpeedTest.desktop (100%) rename .linux_items/{archlive => include/live}/mkinitcpio.conf (100%) rename .linux_items/{archlive => include/live}/packages.both (100%) rename .linux_items/{archlive => include/live}/packages.i686 (100%) rename .linux_items/{archlive => include/live}/packages.x86_64 (100%) rename .linux_items/{archlive => include/live}/pacman.conf (100%) diff --git a/.linux_items/build-wk b/.linux_items/build-wk deleted file mode 100644 index dcdefca8..00000000 --- a/.linux_items/build-wk +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -#/srv/ArchBuilds -# Set Vars -LOG_DIR="/mnt/Build/logs" -OUT_DIR="/mnt/Build/isos" -TMP_DIR="/mnt/Scratch" -DATE="$(date +%F)" -DATETIME="$(date +%F_%H%M)" - -if [[ "$EUID" -eq 0 ]]; then - ## Elevated section ## - # Set permissions - echo "Setting permissions..." - chown root.root archlive -R - chmod 700 archlive/airootfs/etc/skel/.ssh - chmod 600 archlive/airootfs/etc/skel/.ssh/id_rsa - - # Modify build.sh - if ! grep -iq 'customize_iso' archlive/build.sh; then - sed -ir 's!run_once make_iso!# customize_iso\ncp -a ${script_path}/extra/* ${work_dir}/iso/\n\nrun_once make_iso!' archlive/build.sh - fi - - # Build ISO - mkdir $LOG_DIR - mkdir $OUT_DIR - mkdir $TMP_DIR - ./archlive/build.sh -N "wk-arch" -V "$DATE" -L "WK_ARCH" -w "$TMP_DIR" -o "$OUT_DIR" -v | tee -a "$LOG_DIR/$DATETIME.log" - - # Cleanup - echo "Removing temp files..." - rm "$TMP_DIR" -Rf | tee -a "$LOG_DIR/$DATETIME.log" - - echo "Reverting permissions..." - chown builduser.builduser archlive -R -else - ## Non-elevated section ## - # Prep - mkdir wk-repo - pushd wk-repo >/dev/null - BEFORE=$(date "+%F_%H%M%S") - mkdir _done/$BEFORE -p - find . -maxdepth 1 -not -name 'update' -and -not -name '_done' -exec mv -nv "{}" _done/$BEFORE/ \; - rmdir _done/* --ignore-fail-on-non-empty - sleep 1s - AFTER=$(date "+%F_%H%M%S") - - # Install Dependancies - sudo pacman -Syu base-devel libewf attr progsreiserfs --needed --noconfirm - #for p in lha; do - # echo "Installing dependancy: $p" - # curl -LsfO https://aur.archlinux.org/cgit/aur.git/snapshot/$p.tar.gz - # tar xf $p.tar.gz - # pushd $p >/dev/null - # makepkg -si --needed --noconfirm - # popd >/dev/null - # mv -n $p $p.tar.gz _done/$AFTER/ - #done - - # Build custom repo packages - mkdir _done/$AFTER - for p in aic94xx-firmware bash-pipes gtk-theme-arc-git hfsprogs i3-gaps i3lock-fancy-git mprime-bin openbox-patched papirus-icon-theme pasystray testdisk-wip ttf-font-awesome wd719x-firmware wimlib; do - echo "Building: $p" - curl -LsfO https://aur.archlinux.org/cgit/aur.git/snapshot/$p.tar.gz - tar xf $p.tar.gz - pushd $p >/dev/null - makepkg -s --noconfirm - popd >/dev/null - mv -n $p/*xz ./ - mv -n $p $p.tar.gz _done/$AFTER/ - done - - # Build custom repo database - for p in *xz; do - repo-add wk-repo.db.tar.gz $p - done - popd >/dev/null - - # Rerun script as root to start Archiso build process - sudo "$0" -fi diff --git a/.linux_items/archlive/airootfs/usr/local/bin/arch.conf b/.linux_items/include/iso/arch/arch.conf similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/arch.conf rename to .linux_items/include/iso/arch/arch.conf diff --git a/.linux_items/archlive/extra/arch/conky.rc b/.linux_items/include/iso/arch/conky.rc similarity index 100% rename from .linux_items/archlive/extra/arch/conky.rc rename to .linux_items/include/iso/arch/conky.rc diff --git a/.linux_items/archlive/airootfs/usr/local/bin/wifi.conf b/.linux_items/include/iso/arch/wifi.conf similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/wifi.conf rename to .linux_items/include/iso/arch/wifi.conf diff --git a/.linux_items/archlive/airootfs/etc/default/ufw b/.linux_items/include/live/airootfs/etc/default/ufw similarity index 100% rename from .linux_items/archlive/airootfs/etc/default/ufw rename to .linux_items/include/live/airootfs/etc/default/ufw diff --git a/.linux_items/archlive/airootfs/etc/fstab b/.linux_items/include/live/airootfs/etc/fstab similarity index 100% rename from .linux_items/archlive/airootfs/etc/fstab rename to .linux_items/include/live/airootfs/etc/fstab diff --git a/.linux_items/archlive/airootfs/etc/locale.conf b/.linux_items/include/live/airootfs/etc/locale.conf similarity index 100% rename from .linux_items/archlive/airootfs/etc/locale.conf rename to .linux_items/include/live/airootfs/etc/locale.conf diff --git a/.linux_items/archlive/airootfs/etc/locale.gen b/.linux_items/include/live/airootfs/etc/locale.gen similarity index 100% rename from .linux_items/archlive/airootfs/etc/locale.gen rename to .linux_items/include/live/airootfs/etc/locale.gen diff --git a/.linux_items/archlive/airootfs/etc/machine-id b/.linux_items/include/live/airootfs/etc/machine-id similarity index 100% rename from .linux_items/archlive/airootfs/etc/machine-id rename to .linux_items/include/live/airootfs/etc/machine-id diff --git a/.linux_items/archlive/airootfs/etc/motd b/.linux_items/include/live/airootfs/etc/motd similarity index 100% rename from .linux_items/archlive/airootfs/etc/motd rename to .linux_items/include/live/airootfs/etc/motd diff --git a/.linux_items/archlive/airootfs/etc/oblogout.conf b/.linux_items/include/live/airootfs/etc/oblogout.conf similarity index 100% rename from .linux_items/archlive/airootfs/etc/oblogout.conf rename to .linux_items/include/live/airootfs/etc/oblogout.conf diff --git a/.linux_items/archlive/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules b/.linux_items/include/live/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules similarity index 100% rename from .linux_items/archlive/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules rename to .linux_items/include/live/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules diff --git a/.linux_items/archlive/airootfs/etc/skel/.Xresources b/.linux_items/include/live/airootfs/etc/skel/.Xresources similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.Xresources rename to .linux_items/include/live/airootfs/etc/skel/.Xresources diff --git a/.linux_items/archlive/airootfs/etc/skel/.aliases b/.linux_items/include/live/airootfs/etc/skel/.aliases similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.aliases rename to .linux_items/include/live/airootfs/etc/skel/.aliases diff --git a/.linux_items/archlive/airootfs/etc/skel/.bash_logout b/.linux_items/include/live/airootfs/etc/skel/.bash_logout similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.bash_logout rename to .linux_items/include/live/airootfs/etc/skel/.bash_logout diff --git a/.linux_items/archlive/airootfs/etc/skel/.bash_profile b/.linux_items/include/live/airootfs/etc/skel/.bash_profile similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.bash_profile rename to .linux_items/include/live/airootfs/etc/skel/.bash_profile diff --git a/.linux_items/archlive/airootfs/etc/skel/.bashrc b/.linux_items/include/live/airootfs/etc/skel/.bashrc similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.bashrc rename to .linux_items/include/live/airootfs/etc/skel/.bashrc diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/Thunar/accels.scm b/.linux_items/include/live/airootfs/etc/skel/.config/Thunar/accels.scm similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/Thunar/accels.scm rename to .linux_items/include/live/airootfs/etc/skel/.config/Thunar/accels.scm diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/Thunar/uca.xml b/.linux_items/include/live/airootfs/etc/skel/.config/Thunar/uca.xml similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/Thunar/uca.xml rename to .linux_items/include/live/airootfs/etc/skel/.config/Thunar/uca.xml diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/dunst/dunstrc b/.linux_items/include/live/airootfs/etc/skel/.config/dunst/dunstrc similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/dunst/dunstrc rename to .linux_items/include/live/airootfs/etc/skel/.config/dunst/dunstrc diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini b/.linux_items/include/live/airootfs/etc/skel/.config/gtk-3.0/settings.ini similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini rename to .linux_items/include/live/airootfs/etc/skel/.config/gtk-3.0/settings.ini diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/i3/config b/.linux_items/include/live/airootfs/etc/skel/.config/i3/config similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/i3/config rename to .linux_items/include/live/airootfs/etc/skel/.config/i3/config diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/i3status/config b/.linux_items/include/live/airootfs/etc/skel/.config/i3status/config similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/i3status/config rename to .linux_items/include/live/airootfs/etc/skel/.config/i3status/config diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/mimeapps.list b/.linux_items/include/live/airootfs/etc/skel/.config/mimeapps.list similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/mimeapps.list rename to .linux_items/include/live/airootfs/etc/skel/.config/mimeapps.list diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/openbox/autostart b/.linux_items/include/live/airootfs/etc/skel/.config/openbox/autostart similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/openbox/autostart rename to .linux_items/include/live/airootfs/etc/skel/.config/openbox/autostart diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/openbox/environment b/.linux_items/include/live/airootfs/etc/skel/.config/openbox/environment similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/openbox/environment rename to .linux_items/include/live/airootfs/etc/skel/.config/openbox/environment diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/openbox/menu.xml b/.linux_items/include/live/airootfs/etc/skel/.config/openbox/menu.xml similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/openbox/menu.xml rename to .linux_items/include/live/airootfs/etc/skel/.config/openbox/menu.xml diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/openbox/rc.xml b/.linux_items/include/live/airootfs/etc/skel/.config/openbox/rc.xml similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/openbox/rc.xml rename to .linux_items/include/live/airootfs/etc/skel/.config/openbox/rc.xml diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/rofi/config b/.linux_items/include/live/airootfs/etc/skel/.config/rofi/config similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/rofi/config rename to .linux_items/include/live/airootfs/etc/skel/.config/rofi/config diff --git a/.linux_items/archlive/airootfs/etc/skel/.config/tint2/tint2rc b/.linux_items/include/live/airootfs/etc/skel/.config/tint2/tint2rc similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.config/tint2/tint2rc rename to .linux_items/include/live/airootfs/etc/skel/.config/tint2/tint2rc diff --git a/.linux_items/archlive/airootfs/etc/skel/.conky_start b/.linux_items/include/live/airootfs/etc/skel/.conky_start similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.conky_start rename to .linux_items/include/live/airootfs/etc/skel/.conky_start diff --git a/.linux_items/archlive/airootfs/etc/skel/.conkyrc b/.linux_items/include/live/airootfs/etc/skel/.conkyrc similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.conkyrc rename to .linux_items/include/live/airootfs/etc/skel/.conkyrc diff --git a/.linux_items/archlive/airootfs/etc/skel/.dircolors b/.linux_items/include/live/airootfs/etc/skel/.dircolors similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.dircolors rename to .linux_items/include/live/airootfs/etc/skel/.dircolors diff --git a/.linux_items/archlive/airootfs/etc/skel/.gstreamer-0.10/registry.x86_64.bin b/.linux_items/include/live/airootfs/etc/skel/.gstreamer-0.10/registry.x86_64.bin similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.gstreamer-0.10/registry.x86_64.bin rename to .linux_items/include/live/airootfs/etc/skel/.gstreamer-0.10/registry.x86_64.bin diff --git a/.linux_items/archlive/airootfs/etc/skel/.gtkrc-2.0 b/.linux_items/include/live/airootfs/etc/skel/.gtkrc-2.0 similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.gtkrc-2.0 rename to .linux_items/include/live/airootfs/etc/skel/.gtkrc-2.0 diff --git a/.linux_items/archlive/airootfs/etc/skel/.local/share/notes/Notes/Notes b/.linux_items/include/live/airootfs/etc/skel/.local/share/notes/Notes/Notes similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.local/share/notes/Notes/Notes rename to .linux_items/include/live/airootfs/etc/skel/.local/share/notes/Notes/Notes diff --git a/.linux_items/archlive/airootfs/etc/skel/.local/share/recently-used.xbel b/.linux_items/include/live/airootfs/etc/skel/.local/share/recently-used.xbel similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.local/share/recently-used.xbel rename to .linux_items/include/live/airootfs/etc/skel/.local/share/recently-used.xbel diff --git a/.linux_items/archlive/airootfs/etc/skel/.network_start b/.linux_items/include/live/airootfs/etc/skel/.network_start similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.network_start rename to .linux_items/include/live/airootfs/etc/skel/.network_start diff --git a/.linux_items/archlive/airootfs/etc/skel/.rsync_exclusions b/.linux_items/include/live/airootfs/etc/skel/.rsync_exclusions similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.rsync_exclusions rename to .linux_items/include/live/airootfs/etc/skel/.rsync_exclusions diff --git a/.linux_items/archlive/airootfs/etc/skel/.tmux.conf b/.linux_items/include/live/airootfs/etc/skel/.tmux.conf similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.tmux.conf rename to .linux_items/include/live/airootfs/etc/skel/.tmux.conf diff --git a/.linux_items/archlive/airootfs/etc/skel/.update_conky b/.linux_items/include/live/airootfs/etc/skel/.update_conky similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.update_conky rename to .linux_items/include/live/airootfs/etc/skel/.update_conky diff --git a/.linux_items/archlive/airootfs/etc/skel/.update_wallpaper b/.linux_items/include/live/airootfs/etc/skel/.update_wallpaper similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.update_wallpaper rename to .linux_items/include/live/airootfs/etc/skel/.update_wallpaper diff --git a/.linux_items/archlive/airootfs/etc/skel/.urxvt_default_res b/.linux_items/include/live/airootfs/etc/skel/.urxvt_default_res similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.urxvt_default_res rename to .linux_items/include/live/airootfs/etc/skel/.urxvt_default_res diff --git a/.linux_items/archlive/airootfs/etc/skel/.vimrc b/.linux_items/include/live/airootfs/etc/skel/.vimrc similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.vimrc rename to .linux_items/include/live/airootfs/etc/skel/.vimrc diff --git a/.linux_items/archlive/airootfs/etc/skel/.xinitrc b/.linux_items/include/live/airootfs/etc/skel/.xinitrc similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.xinitrc rename to .linux_items/include/live/airootfs/etc/skel/.xinitrc diff --git a/.linux_items/archlive/airootfs/etc/skel/.zlogin b/.linux_items/include/live/airootfs/etc/skel/.zlogin similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.zlogin rename to .linux_items/include/live/airootfs/etc/skel/.zlogin diff --git a/.linux_items/archlive/airootfs/etc/skel/.zshrc b/.linux_items/include/live/airootfs/etc/skel/.zshrc similarity index 100% rename from .linux_items/archlive/airootfs/etc/skel/.zshrc rename to .linux_items/include/live/airootfs/etc/skel/.zshrc diff --git a/.linux_items/archlive/airootfs/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service b/.linux_items/include/live/airootfs/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service similarity index 100% rename from .linux_items/archlive/airootfs/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service rename to .linux_items/include/live/airootfs/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service diff --git a/.linux_items/archlive/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service b/.linux_items/include/live/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service similarity index 100% rename from .linux_items/archlive/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service rename to .linux_items/include/live/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service diff --git a/.linux_items/archlive/airootfs/etc/systemd/system/display-manager.service b/.linux_items/include/live/airootfs/etc/systemd/system/display-manager.service similarity index 100% rename from .linux_items/archlive/airootfs/etc/systemd/system/display-manager.service rename to .linux_items/include/live/airootfs/etc/systemd/system/display-manager.service diff --git a/.linux_items/archlive/airootfs/etc/systemd/system/getty.target.wants/getty@tty1.service b/.linux_items/include/live/airootfs/etc/systemd/system/getty.target.wants/getty@tty1.service similarity index 100% rename from .linux_items/archlive/airootfs/etc/systemd/system/getty.target.wants/getty@tty1.service rename to .linux_items/include/live/airootfs/etc/systemd/system/getty.target.wants/getty@tty1.service diff --git a/.linux_items/archlive/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/.linux_items/include/live/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf similarity index 100% rename from .linux_items/archlive/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf rename to .linux_items/include/live/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf diff --git a/.linux_items/archlive/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service similarity index 100% rename from .linux_items/archlive/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service rename to .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service diff --git a/.linux_items/archlive/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service similarity index 100% rename from .linux_items/archlive/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service rename to .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service diff --git a/.linux_items/archlive/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service similarity index 100% rename from .linux_items/archlive/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service rename to .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service diff --git a/.linux_items/archlive/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service b/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service similarity index 100% rename from .linux_items/archlive/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service rename to .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service diff --git a/.linux_items/archlive/airootfs/etc/udev/rules.d/99-udisks2.rules b/.linux_items/include/live/airootfs/etc/udev/rules.d/99-udisks2.rules similarity index 100% rename from .linux_items/archlive/airootfs/etc/udev/rules.d/99-udisks2.rules rename to .linux_items/include/live/airootfs/etc/udev/rules.d/99-udisks2.rules diff --git a/.linux_items/archlive/airootfs/etc/udevil/udevil.conf b/.linux_items/include/live/airootfs/etc/udevil/udevil.conf similarity index 100% rename from .linux_items/archlive/airootfs/etc/udevil/udevil.conf rename to .linux_items/include/live/airootfs/etc/udevil/udevil.conf diff --git a/.linux_items/archlive/airootfs/etc/ufw/after.init b/.linux_items/include/live/airootfs/etc/ufw/after.init similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/after.init rename to .linux_items/include/live/airootfs/etc/ufw/after.init diff --git a/.linux_items/archlive/airootfs/etc/ufw/after.rules b/.linux_items/include/live/airootfs/etc/ufw/after.rules similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/after.rules rename to .linux_items/include/live/airootfs/etc/ufw/after.rules diff --git a/.linux_items/archlive/airootfs/etc/ufw/after6.rules b/.linux_items/include/live/airootfs/etc/ufw/after6.rules similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/after6.rules rename to .linux_items/include/live/airootfs/etc/ufw/after6.rules diff --git a/.linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-bittorent b/.linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-bittorent similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-bittorent rename to .linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-bittorent diff --git a/.linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-chat b/.linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-chat similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-chat rename to .linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-chat diff --git a/.linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-directoryserver b/.linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-directoryserver similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-directoryserver rename to .linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-directoryserver diff --git a/.linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-dnsserver b/.linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-dnsserver similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-dnsserver rename to .linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-dnsserver diff --git a/.linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-fileserver b/.linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-fileserver similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-fileserver rename to .linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-fileserver diff --git a/.linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-loginserver b/.linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-loginserver similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-loginserver rename to .linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-loginserver diff --git a/.linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-mailserver b/.linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-mailserver similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-mailserver rename to .linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-mailserver diff --git a/.linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-printserver b/.linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-printserver similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-printserver rename to .linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-printserver diff --git a/.linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-proxyserver b/.linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-proxyserver similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-proxyserver rename to .linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-proxyserver diff --git a/.linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-webserver b/.linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-webserver similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/applications.d/ufw-webserver rename to .linux_items/include/live/airootfs/etc/ufw/applications.d/ufw-webserver diff --git a/.linux_items/archlive/airootfs/etc/ufw/before.init b/.linux_items/include/live/airootfs/etc/ufw/before.init similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/before.init rename to .linux_items/include/live/airootfs/etc/ufw/before.init diff --git a/.linux_items/archlive/airootfs/etc/ufw/before.rules b/.linux_items/include/live/airootfs/etc/ufw/before.rules similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/before.rules rename to .linux_items/include/live/airootfs/etc/ufw/before.rules diff --git a/.linux_items/archlive/airootfs/etc/ufw/before6.rules b/.linux_items/include/live/airootfs/etc/ufw/before6.rules similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/before6.rules rename to .linux_items/include/live/airootfs/etc/ufw/before6.rules diff --git a/.linux_items/archlive/airootfs/etc/ufw/sysctl.conf b/.linux_items/include/live/airootfs/etc/ufw/sysctl.conf similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/sysctl.conf rename to .linux_items/include/live/airootfs/etc/ufw/sysctl.conf diff --git a/.linux_items/archlive/airootfs/etc/ufw/ufw.conf b/.linux_items/include/live/airootfs/etc/ufw/ufw.conf similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/ufw.conf rename to .linux_items/include/live/airootfs/etc/ufw/ufw.conf diff --git a/.linux_items/archlive/airootfs/etc/ufw/user.rules b/.linux_items/include/live/airootfs/etc/ufw/user.rules similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/user.rules rename to .linux_items/include/live/airootfs/etc/ufw/user.rules diff --git a/.linux_items/archlive/airootfs/etc/ufw/user6.rules b/.linux_items/include/live/airootfs/etc/ufw/user6.rules similarity index 100% rename from .linux_items/archlive/airootfs/etc/ufw/user6.rules rename to .linux_items/include/live/airootfs/etc/ufw/user6.rules diff --git a/.linux_items/archlive/airootfs/etc/vconsole.conf b/.linux_items/include/live/airootfs/etc/vconsole.conf similarity index 100% rename from .linux_items/archlive/airootfs/etc/vconsole.conf rename to .linux_items/include/live/airootfs/etc/vconsole.conf diff --git a/.linux_items/archlive/airootfs/etc/xdg/xfce4/kiosk/kioskrc b/.linux_items/include/live/airootfs/etc/xdg/xfce4/kiosk/kioskrc similarity index 100% rename from .linux_items/archlive/airootfs/etc/xdg/xfce4/kiosk/kioskrc rename to .linux_items/include/live/airootfs/etc/xdg/xfce4/kiosk/kioskrc diff --git a/.linux_items/archlive/airootfs/root/.automated_script.sh b/.linux_items/include/live/airootfs/root/.automated_script.sh similarity index 100% rename from .linux_items/archlive/airootfs/root/.automated_script.sh rename to .linux_items/include/live/airootfs/root/.automated_script.sh diff --git a/.linux_items/archlive/airootfs/root/.zlogin b/.linux_items/include/live/airootfs/root/.zlogin similarity index 100% rename from .linux_items/archlive/airootfs/root/.zlogin rename to .linux_items/include/live/airootfs/root/.zlogin diff --git a/.linux_items/archlive/airootfs/root/customize_airootfs.sh b/.linux_items/include/live/airootfs/root/customize_airootfs.sh similarity index 100% rename from .linux_items/archlive/airootfs/root/customize_airootfs.sh rename to .linux_items/include/live/airootfs/root/customize_airootfs.sh diff --git a/.linux_items/archlive/airootfs/root/install.txt b/.linux_items/include/live/airootfs/root/install.txt similarity index 100% rename from .linux_items/archlive/airootfs/root/install.txt rename to .linux_items/include/live/airootfs/root/install.txt diff --git a/.linux_items/archlive/airootfs/usr/local/bin/apple_fans b/.linux_items/include/live/airootfs/usr/local/bin/apple_fans similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/apple_fans rename to .linux_items/include/live/airootfs/usr/local/bin/apple_fans diff --git a/.linux_items/archlive/extra/arch/arch.conf b/.linux_items/include/live/airootfs/usr/local/bin/arch.conf similarity index 100% rename from .linux_items/archlive/extra/arch/arch.conf rename to .linux_items/include/live/airootfs/usr/local/bin/arch.conf diff --git a/.linux_items/archlive/airootfs/usr/local/bin/connect-to-network b/.linux_items/include/live/airootfs/usr/local/bin/connect-to-network similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/connect-to-network rename to .linux_items/include/live/airootfs/usr/local/bin/connect-to-network diff --git a/.linux_items/archlive/airootfs/usr/local/bin/hw-diags b/.linux_items/include/live/airootfs/usr/local/bin/hw-diags similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/hw-diags rename to .linux_items/include/live/airootfs/usr/local/bin/hw-diags diff --git a/.linux_items/archlive/airootfs/usr/local/bin/hw-diags-audio b/.linux_items/include/live/airootfs/usr/local/bin/hw-diags-audio similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/hw-diags-audio rename to .linux_items/include/live/airootfs/usr/local/bin/hw-diags-audio diff --git a/.linux_items/archlive/airootfs/usr/local/bin/hw-diags-badblocks b/.linux_items/include/live/airootfs/usr/local/bin/hw-diags-badblocks similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/hw-diags-badblocks rename to .linux_items/include/live/airootfs/usr/local/bin/hw-diags-badblocks diff --git a/.linux_items/archlive/airootfs/usr/local/bin/hw-diags-inner b/.linux_items/include/live/airootfs/usr/local/bin/hw-diags-inner similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/hw-diags-inner rename to .linux_items/include/live/airootfs/usr/local/bin/hw-diags-inner diff --git a/.linux_items/archlive/airootfs/usr/local/bin/hw-diags-network b/.linux_items/include/live/airootfs/usr/local/bin/hw-diags-network similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/hw-diags-network rename to .linux_items/include/live/airootfs/usr/local/bin/hw-diags-network diff --git a/.linux_items/archlive/airootfs/usr/local/bin/hw-diags-prime95 b/.linux_items/include/live/airootfs/usr/local/bin/hw-diags-prime95 similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/hw-diags-prime95 rename to .linux_items/include/live/airootfs/usr/local/bin/hw-diags-prime95 diff --git a/.linux_items/archlive/airootfs/usr/local/bin/hw-diags-progress b/.linux_items/include/live/airootfs/usr/local/bin/hw-diags-progress similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/hw-diags-progress rename to .linux_items/include/live/airootfs/usr/local/bin/hw-diags-progress diff --git a/.linux_items/archlive/airootfs/usr/local/bin/hw-diags-sensors b/.linux_items/include/live/airootfs/usr/local/bin/hw-diags-sensors similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/hw-diags-sensors rename to .linux_items/include/live/airootfs/usr/local/bin/hw-diags-sensors diff --git a/.linux_items/archlive/airootfs/usr/local/bin/mount-all-volumes b/.linux_items/include/live/airootfs/usr/local/bin/mount-all-volumes similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/mount-all-volumes rename to .linux_items/include/live/airootfs/usr/local/bin/mount-all-volumes diff --git a/.linux_items/archlive/airootfs/usr/local/bin/mount-all-volumes-foh b/.linux_items/include/live/airootfs/usr/local/bin/mount-all-volumes-foh similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/mount-all-volumes-foh rename to .linux_items/include/live/airootfs/usr/local/bin/mount-all-volumes-foh diff --git a/.linux_items/archlive/airootfs/usr/local/bin/mount-backup-shares b/.linux_items/include/live/airootfs/usr/local/bin/mount-backup-shares similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/mount-backup-shares rename to .linux_items/include/live/airootfs/usr/local/bin/mount-backup-shares diff --git a/.linux_items/archlive/airootfs/usr/local/bin/msword-search b/.linux_items/include/live/airootfs/usr/local/bin/msword-search similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/msword-search rename to .linux_items/include/live/airootfs/usr/local/bin/msword-search diff --git a/.linux_items/archlive/airootfs/usr/local/bin/remount-rw b/.linux_items/include/live/airootfs/usr/local/bin/remount-rw similarity index 100% rename from .linux_items/archlive/airootfs/usr/local/bin/remount-rw rename to .linux_items/include/live/airootfs/usr/local/bin/remount-rw diff --git a/.linux_items/archlive/extra/arch/wifi.conf b/.linux_items/include/live/airootfs/usr/local/bin/wifi.conf similarity index 100% rename from .linux_items/archlive/extra/arch/wifi.conf rename to .linux_items/include/live/airootfs/usr/local/bin/wifi.conf diff --git a/.linux_items/archlive/airootfs/usr/share/applications/Hardware Diagnostics.desktop b/.linux_items/include/live/airootfs/usr/share/applications/Hardware Diagnostics.desktop similarity index 100% rename from .linux_items/archlive/airootfs/usr/share/applications/Hardware Diagnostics.desktop rename to .linux_items/include/live/airootfs/usr/share/applications/Hardware Diagnostics.desktop diff --git a/.linux_items/archlive/airootfs/usr/share/applications/Hardware Information.desktop b/.linux_items/include/live/airootfs/usr/share/applications/Hardware Information.desktop similarity index 100% rename from .linux_items/archlive/airootfs/usr/share/applications/Hardware Information.desktop rename to .linux_items/include/live/airootfs/usr/share/applications/Hardware Information.desktop diff --git a/.linux_items/archlive/airootfs/usr/share/applications/NetworkTest.desktop b/.linux_items/include/live/airootfs/usr/share/applications/NetworkTest.desktop similarity index 100% rename from .linux_items/archlive/airootfs/usr/share/applications/NetworkTest.desktop rename to .linux_items/include/live/airootfs/usr/share/applications/NetworkTest.desktop diff --git a/.linux_items/archlive/airootfs/usr/share/applications/SpeedTest.desktop b/.linux_items/include/live/airootfs/usr/share/applications/SpeedTest.desktop similarity index 100% rename from .linux_items/archlive/airootfs/usr/share/applications/SpeedTest.desktop rename to .linux_items/include/live/airootfs/usr/share/applications/SpeedTest.desktop diff --git a/.linux_items/archlive/mkinitcpio.conf b/.linux_items/include/live/mkinitcpio.conf similarity index 100% rename from .linux_items/archlive/mkinitcpio.conf rename to .linux_items/include/live/mkinitcpio.conf diff --git a/.linux_items/archlive/packages.both b/.linux_items/include/live/packages.both similarity index 100% rename from .linux_items/archlive/packages.both rename to .linux_items/include/live/packages.both diff --git a/.linux_items/archlive/packages.i686 b/.linux_items/include/live/packages.i686 similarity index 100% rename from .linux_items/archlive/packages.i686 rename to .linux_items/include/live/packages.i686 diff --git a/.linux_items/archlive/packages.x86_64 b/.linux_items/include/live/packages.x86_64 similarity index 100% rename from .linux_items/archlive/packages.x86_64 rename to .linux_items/include/live/packages.x86_64 diff --git a/.linux_items/archlive/pacman.conf b/.linux_items/include/live/pacman.conf similarity index 100% rename from .linux_items/archlive/pacman.conf rename to .linux_items/include/live/pacman.conf diff --git a/Build Linux b/Build Linux index f53be02f..c080a108 100755 --- a/Build Linux +++ b/Build Linux @@ -50,11 +50,14 @@ function cleanup() { function copy_archiso() { echo "Copying Archlinux files..." - rsync -a /usr/share/archiso/configs/releng/ "$ARCHLIVE_DIR/" + rsync -aI /usr/share/archiso/configs/releng/ "$ARCHLIVE_DIR/" + # Add items + rsync -aI "$ROOT_DIR/.linux_items/include/live/" "$ARCHLIVE_DIR/" + # Update build.sh - if ! grep -iq 'customize_iso' archlive/build.sh; then - sed -ir 's!run_once make_iso!# customize_iso\ncp -a ${script_path}/extra/* ${work_dir}/iso/\n\nrun_once make_iso!' archlive/build.sh + if ! grep -iq 'customize_iso' "$ARCHLIVE_DIR/build.sh"; then + sed -ir "s!run_once make_iso\$!# customize_iso\ncp -a \"$ROOT_DIR/.linux_items/include/iso\"/* \"\${work_dir}/iso\"/\n\nrun_once make_iso!" "$ARCHLIVE_DIR/build.sh" fi } @@ -182,6 +185,10 @@ case $1 in build_arch ;; + --copy-archiso) + copy_archiso + ;; + --install-deps) install_deps ;;