Merge branch 'no-root'

Author: Hayao0819

airootfs/etc/systemd/system/[email protected]/autologin.conf

@@ -1,3 +1,3 @@
 [Service]
 ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux
+ExecStart=-/sbin/agetty --autologin alter --noclear %I 38400 linux

airootfs/root/customize_airootfs.sh

@@ -2,6 +2,18 @@
 
 set -e -u
 
+# パスワード
+password=alter
+
+# オプション解析
+while getopts 'p:' arg; do
+    case "${arg}" in
+        p) password=${OPTARG};;
+    esac
+done
+
+
+
 sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
 locale-gen
 
@@ -13,14 +25,23 @@ cp -aT /etc/skel/ /root/
 chmod 700 /root
 LC_ALL=C xdg-user-dirs-update
 LANG=C xdg-user-dirs-update
+echo -e "${password}\n${password}" | passwd root
+
 
-<<DISABLED
 useradd -m -s /bin/bash alter
 groupadd sudo
-usermod -G sudo arch
+usermod -G sudo alter
 sed -i 's/^#\s*\(%sudo\s\+ALL=(ALL)\s\+ALL\)/\1/' /etc/sudoers
-cp -aT /etc/skel/ /home/arch/
-DISABLED
+cp -aT /etc/skel/ /home/alter/
+chmod 700 -R /home/alter
+chown alter:alter -R /home/alter
+echo -e "${password}\n${password}" | passwd alter
+
+cat >> /etc/sudoers << 'EOF'
+alter ALL=NOPASSWD: /usr/bin/calamares
+alter ALL=NOPASSWD: /usr/bin/calamares_polkit
+EOF
+
 
 [[ -d /usr/share/calamares/branding/manjaro ]] && rm -rf /usr/share/calamares/branding/manjaro
 rm /usr/share/backgrounds/xfce/xfce-stripes.png

airootfs/usr/share/applications/calamares.desktop

@@ -8,7 +8,7 @@ GenericName[da]=Live-installationsprogram
 Comment=Install the operating system to disk
 Comment[da]=Installer styresystemet på disk
 Comment[de]=Alter Linux installieren
-Exec=/usr/bin/calamares_polkit %f
+Exec=sudo /usr/bin/calamares_polkit %f
 Icon=calamares
 Terminal=false
 StartupNotify=true

build.sh

@@ -11,6 +11,7 @@ install_dir=alter
 work_dir=work
 out_dir=out
 gpg_key=
+password=alter
 
 verbose=""
 script_path=$(readlink -f ${0%/*})
@@ -66,7 +67,7 @@ make_basefs() {
 
 # Additional packages (airootfs)
 make_packages() {
-    mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.x86_64)" install
+    mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "$(grep -h -v ^'#' ${script_path}/packages.x86_64)" install
 }
 
 # Copy mkinitcpio archiso hooks and build initramfs (airootfs)
@@ -103,7 +104,7 @@ make_customize_airootfs() {
 
     # lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/x86_64/airootfs/root/install.txt
 
-    mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r '/root/customize_airootfs.sh' run
+    mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r "/root/customize_airootfs.sh -p ${password}" run
     rm ${work_dir}/x86_64/airootfs/root/customize_airootfs.sh
 }
 
@@ -229,14 +230,15 @@ if [[ ${EUID} -ne 0 ]]; then
     _usage 1
 fi
 
-while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do
+while getopts 'N:V:L:P:A:D:w:o:g:vhp:' arg; do
     case "${arg}" in
         N) iso_name="${OPTARG}" ;;
         V) iso_version="${OPTARG}" ;;
         L) iso_label="${OPTARG}" ;;
         P) iso_publisher="${OPTARG}" ;;
         A) iso_application="${OPTARG}" ;;
         D) install_dir="${OPTARG}" ;;
+        p) password="${OPTARG}" ;;
         w) work_dir="${OPTARG}" ;;
         o) out_dir="${OPTARG}" ;;
         g) gpg_key="${OPTARG}" ;;