diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b8f99f5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +work diff --git a/arch-custom/airootfs/etc/pacman.d/hooks/40-locale-gen.hook b/arch-custom/airootfs/etc/pacman.d/hooks/40-locale-gen.hook index 82dd199..c459e94 100644 --- a/arch-custom/airootfs/etc/pacman.d/hooks/40-locale-gen.hook +++ b/arch-custom/airootfs/etc/pacman.d/hooks/40-locale-gen.hook @@ -5,9 +5,9 @@ Type = Package Target = glibc [Action] -Description = Uncommenting en_US.UTF-8 locale and running locale-gen... +Description = Uncommenting de_DE.UTF-8 locale and running locale-gen... When = PostTransaction Depends = glibc Depends = sed Depends = sh -Exec = /bin/sh -c "sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen && locale-gen" +Exec = /bin/sh -c "sed -i 's/#\(de_DE\.UTF-8\)/\1/' /etc/locale.gen && locale-gen" diff --git a/arch-custom/airootfs/usr/local/bin/choose-mirror b/arch-custom/airootfs/usr/local/bin/choose-mirror index b021945..ce583b8 100755 --- a/arch-custom/airootfs/usr/local/bin/choose-mirror +++ b/arch-custom/airootfs/usr/local/bin/choose-mirror @@ -19,10 +19,5 @@ mirror=$(get_cmdline mirror) 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/arch-custom/profiledef.sh b/arch-custom/profiledef.sh index 87c69b3..cb43ac8 100644 --- a/arch-custom/profiledef.sh +++ b/arch-custom/profiledef.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash # shellcheck disable=SC2034 -iso_name="archlinux-trauma" +iso_name="trauma-linux" iso_label="ARCH_$(date +%Y%m)" -iso_publisher="fix " -iso_application="Arch Linux Trauma MR Edition" +iso_publisher="fix " +iso_application="Trauma Linux" iso_version="$(date +%Y.%m.%d)" install_dir="arch" buildmodes=('iso') @@ -19,16 +19,11 @@ file_permissions=( ["/etc/nsswitch.conf"]="0:0:644" ["/etc/nslcd.conf"]="0:0:644" ["/etc/openldap/openldap.conf"]="0:0:644" - ["/etc/pamd.d"]="0:0:755" - ["/etc/pamd.d/system-auth"]="0:0:644" - ["/etc/pamd.d/sudo"]="0:0:644" - ["/etc/pamd.d/passwd"]="0:0:644" - ["/etc/pamd.d/su"]="0:0:755" - ["/etc/pamd.d/su-l"]="0:0:755" + ["/etc/pamd.d/"]="0:0:744" ["/root"]="0:0:750" ["/root/.automated_script.sh"]="0:0:755" - ["/root/.ssh"]="0:0:600" - ["/root/.ssh/authorized_keys"]="0:0:700" + ["/root/.ssh"]="0:0:700" + ["/root/.ssh/authorized_keys"]="0:0:600" ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/Installation_guide"]="0:0:755" ["/usr/local/bin/livecd-sound"]="0:0:755"