Skip to content

Commit

Permalink
update calamares
Browse files Browse the repository at this point in the history
  • Loading branch information
Evangelospro committed Sep 4, 2023
1 parent 186f633 commit c81daff
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
12 changes: 12 additions & 0 deletions iso/archiso/airootfs/usr/local/bin/fix-hosts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env bash

hostn=$(cat /etc/hostname)
echo -ne "
# Standard host addresses
127.0.0.1 localhost
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
# This host address
127.0.1.1 ${hostn}
" >/etc/hosts
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,17 @@ timeout: 999
# ignored; the slowloris command has a different timeout from the
# other commands in the list):
script:
- command: "/usr/bin/local/fix-hosts"
- "-rm ${ROOT}/etc/sudoers.d/g_wheel"
- "-rm -r ${ROOT}/etc/systemd/system/getty@tty1.service.d"
- "-rm -r ${ROOT}/etc/systemd/system/multi-user.target.wants/pacman-init.service"
- "-rm -r ${ROOT}/etc/systemd/system/pacman-init.service"
- "-rm ${ROOT}/etc/systemd/system/etc-pacman.d-gnupg.mount"
- "-rm ${ROOT}/etc/polkit-1/rules.d/49-nopasswd-calamares.rules"
# Remove calamares and installer
# Remove calamares and installer and helpers
- "-rm ${ROOT}/var/log/Calamares*"
- "-rm /usr/local/bin/installer"
- "-rm /usr/bin/local/fix-hosts"
# remove the /root/.bashrc lines from ### AUTOMATED INSTALLATION START ### to ### AUTOMATED INSTALLATION END ###
- command: "sed -i '/### AUTOMATED INSTALLATION START ###/,/### AUTOMATED INSTALLATION END ###/d' ${ROOT}/root/.bashrc"
# Re-Apply dotfiles to new user
Expand Down
1 change: 1 addition & 0 deletions iso/archiso/profiledef.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ airootfs_image_type="squashfs"
airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
file_permissions=(
["/usr/local/bin/installer"]="0:0:755"
["/usr/local/bin/fix-hosts"]="0:0:755"
["/etc/shadow"]="0:0:400"
["/root"]="0:0:750"
["/usr/local/bin/livecd-sound"]="0:0:755"
Expand Down

0 comments on commit c81daff

Please sign in to comment.