From 604b182af5485b0134fbe750948eba57f385d709 Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Date: Sat, 28 Jun 2014 00:35:50 -0300
Subject: [archiso] Rename root-image to airootfs

Two purposes:
 * systemd filename friendly: "-" is used for "/" and must be escaped with "\x20"
 * ISO9660 filename friendly: "-" is replaced with "_"
---
 configs/releng/root-image/etc/fstab                |  0
 configs/releng/root-image/etc/hostname             |  1 -
 configs/releng/root-image/etc/locale.conf          |  1 -
 configs/releng/root-image/etc/pam.d/su             |  6 ----
 configs/releng/root-image/etc/sudoers.d/g_wheel    |  1 -
 .../root-image/etc/systemd/scripts/choose-mirror   | 26 -----------------
 .../etc/systemd/system/choose-mirror.service       | 10 -------
 .../etc/systemd/system/etc-pacman.d-gnupg.mount    |  8 -----
 .../system/getty@tty1.service.d/autologin.conf     |  3 --
 .../etc/systemd/system/pacman-init.service         | 15 ----------
 .../root-image/etc/udev/rules.d/81-dhcpcd.rules    |  1 -
 .../releng/root-image/root/.automated_script.sh    | 34 ----------------------
 configs/releng/root-image/root/.zlogin             |  1 -
 .../releng/root-image/root/customize_root_image.sh | 22 --------------
 configs/releng/root-image/root/install.txt         |  3 --
 15 files changed, 132 deletions(-)
 delete mode 100644 configs/releng/root-image/etc/fstab
 delete mode 100644 configs/releng/root-image/etc/hostname
 delete mode 100644 configs/releng/root-image/etc/locale.conf
 delete mode 100644 configs/releng/root-image/etc/pam.d/su
 delete mode 100644 configs/releng/root-image/etc/sudoers.d/g_wheel
 delete mode 100755 configs/releng/root-image/etc/systemd/scripts/choose-mirror
 delete mode 100644 configs/releng/root-image/etc/systemd/system/choose-mirror.service
 delete mode 100644 configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount
 delete mode 100644 configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf
 delete mode 100644 configs/releng/root-image/etc/systemd/system/pacman-init.service
 delete mode 100644 configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules
 delete mode 100755 configs/releng/root-image/root/.automated_script.sh
 delete mode 100644 configs/releng/root-image/root/.zlogin
 delete mode 100755 configs/releng/root-image/root/customize_root_image.sh
 delete mode 100644 configs/releng/root-image/root/install.txt

(limited to 'configs/releng/root-image')

diff --git a/configs/releng/root-image/etc/fstab b/configs/releng/root-image/etc/fstab
deleted file mode 100644
index e69de29..0000000
diff --git a/configs/releng/root-image/etc/hostname b/configs/releng/root-image/etc/hostname
deleted file mode 100644
index 2dbe21e..0000000
--- a/configs/releng/root-image/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-archiso
diff --git a/configs/releng/root-image/etc/locale.conf b/configs/releng/root-image/etc/locale.conf
deleted file mode 100644
index 01ec548..0000000
--- a/configs/releng/root-image/etc/locale.conf
+++ /dev/null
@@ -1 +0,0 @@
-LANG=en_US.UTF-8
diff --git a/configs/releng/root-image/etc/pam.d/su b/configs/releng/root-image/etc/pam.d/su
deleted file mode 100644
index a291042..0000000
--- a/configs/releng/root-image/etc/pam.d/su
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		sufficient	pam_wheel.so trust use_uid
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/configs/releng/root-image/etc/sudoers.d/g_wheel b/configs/releng/root-image/etc/sudoers.d/g_wheel
deleted file mode 100644
index 8c45359..0000000
--- a/configs/releng/root-image/etc/sudoers.d/g_wheel
+++ /dev/null
@@ -1 +0,0 @@
-%wheel  ALL=(ALL) NOPASSWD: ALL
diff --git a/configs/releng/root-image/etc/systemd/scripts/choose-mirror b/configs/releng/root-image/etc/systemd/scripts/choose-mirror
deleted file mode 100755
index 0ae0806..0000000
--- a/configs/releng/root-image/etc/systemd/scripts/choose-mirror
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-get_cmdline() {
-    local param
-    for param in $(< /proc/cmdline); do
-        case "${param}" in
-            $1=*) echo "${param##*=}";
-            return 0
-            ;;
-        esac
-    done
-}
-
-mirror=$(get_cmdline mirror)
-[[ $mirror = auto ]] && mirror=$(get_cmdline archiso_http_srv)
-[[ $mirror ]] || exit 0
-
-mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig
-cat >/etc/pacman.d/mirrorlist << EOF
-#
-# Arch Linux repository mirrorlist
-# Generated by archiso
-#
-
-Server = ${mirror%%/}/\$repo/os/\$arch
-EOF
diff --git a/configs/releng/root-image/etc/systemd/system/choose-mirror.service b/configs/releng/root-image/etc/systemd/system/choose-mirror.service
deleted file mode 100644
index 1e4d771..0000000
--- a/configs/releng/root-image/etc/systemd/system/choose-mirror.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Choose mirror from the kernel command line
-ConditionKernelCommandLine=mirror
-
-[Service]
-Type=oneshot
-ExecStart=/etc/systemd/scripts/choose-mirror
-
-[Install]
-WantedBy=multi-user.target
diff --git a/configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount b/configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount
deleted file mode 100644
index 4eab551..0000000
--- a/configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Temporary /etc/pacman.d/gnupg directory
-
-[Mount]
-What=tmpfs
-Where=/etc/pacman.d/gnupg
-Type=tmpfs
-Options=mode=0755
diff --git a/configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf b/configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf
deleted file mode 100644
index d1d8474..0000000
--- a/configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux
diff --git a/configs/releng/root-image/etc/systemd/system/pacman-init.service b/configs/releng/root-image/etc/systemd/system/pacman-init.service
deleted file mode 100644
index 23b8144..0000000
--- a/configs/releng/root-image/etc/systemd/system/pacman-init.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
-Requires=etc-pacman.d-gnupg.mount
-After=etc-pacman.d-gnupg.mount
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/pacman-key --init
-ExecStart=/usr/bin/pacman-key --populate archlinux
-
-[Install]
-WantedBy=multi-user.target
diff --git a/configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules b/configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules
deleted file mode 100644
index 1c4053c..0000000
--- a/configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules
+++ /dev/null
@@ -1 +0,0 @@
-ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="en*|eth*", ENV{SYSTEMD_WANTS}="dhcpcd@$name.service"
diff --git a/configs/releng/root-image/root/.automated_script.sh b/configs/releng/root-image/root/.automated_script.sh
deleted file mode 100755
index 81a98a1..0000000
--- a/configs/releng/root-image/root/.automated_script.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-script_cmdline ()
-{
-    local param
-    for param in $(< /proc/cmdline); do
-        case "${param}" in
-            script=*) echo "${param#*=}" ; return 0 ;;
-        esac
-    done
-}
-
-automated_script ()
-{
-    local script rt
-    script="$(script_cmdline)"
-    if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
-        if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then
-            wget "${script}" --retry-connrefused -q -O /tmp/startup_script >/dev/null
-            rt=$?
-        else
-            cp "${script}" /tmp/startup_script
-            rt=$?
-        fi
-        if [[ ${rt} -eq 0 ]]; then
-            chmod +x /tmp/startup_script
-            /tmp/startup_script
-        fi
-    fi
-}
-
-if [[ $(tty) == "/dev/tty1" ]]; then
-    automated_script
-fi
diff --git a/configs/releng/root-image/root/.zlogin b/configs/releng/root-image/root/.zlogin
deleted file mode 100644
index f598e43..0000000
--- a/configs/releng/root-image/root/.zlogin
+++ /dev/null
@@ -1 +0,0 @@
-~/.automated_script.sh
diff --git a/configs/releng/root-image/root/customize_root_image.sh b/configs/releng/root-image/root/customize_root_image.sh
deleted file mode 100755
index 9c85453..0000000
--- a/configs/releng/root-image/root/customize_root_image.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e -u
-
-sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
-locale-gen
-
-ln -sf /usr/share/zoneinfo/UTC /etc/localtime
-
-usermod -s /usr/bin/zsh root
-cp -aT /etc/skel/ /root/
-
-useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" -s /usr/bin/zsh arch
-
-chmod 750 /etc/sudoers.d
-chmod 440 /etc/sudoers.d/g_wheel
-
-sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
-sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf
-
-systemctl enable pacman-init.service choose-mirror.service
-systemctl set-default multi-user.target
diff --git a/configs/releng/root-image/root/install.txt b/configs/releng/root-image/root/install.txt
deleted file mode 100644
index 3c8f171..0000000
--- a/configs/releng/root-image/root/install.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-View this installation guide online at
-https://wiki.archlinux.org/index.php/Installation_Guide
-
-- 
cgit v1.2.3-70-g09d2