From db7e8a7203fb27b5554e71563200ee6d897fcf8d Mon Sep 17 00:00:00 2001 From: TuDatTr Date: Sun, 24 May 2020 06:24:40 +0200 Subject: [PATCH] Fixed file paths for march-reboot.sh by copying them in install.sh over to the target system --- install.sh | 3 +++ root/march-reboot.sh | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index 0d14f71..1f309ff 100755 --- a/install.sh +++ b/install.sh @@ -117,6 +117,9 @@ cp $CWD/etc/systemd/system/march.service /mnt/etc/systemd/system/march.service cp $CWD/root/march-chroot.sh /mnt/root/march-chroot.sh cp $CWD/root/march-reboot.sh /mnt/root/march-reboot.sh chmod +x /mnt/root/march-chroot.sh +cp $CWD/etc/systemd/system/suspend@.service /root/etc/systemd/system/suspend@.service +cp $CWD/etc/X11/xorg.conf.d/30-touchpad.conf /root/etc/X11/xorg.conf.d/30-touchpad.conf +cp $CWD/etc/iptables/iptables.rules /root/etc/iptables/iptables.rules chmod +x /mnt/root/march-reboot.sh arch-chroot /mnt /root/march-chroot.sh -t "$timezone" -l "$locale" -h "$hostname" -u "$username" -s "$sudogrp" -c "$cryptroot" -r "$rootpart" diff --git a/root/march-reboot.sh b/root/march-reboot.sh index dc5cf2c..8924a03 100644 --- a/root/march-reboot.sh +++ b/root/march-reboot.sh @@ -54,11 +54,11 @@ while true; do esac done -pacman -S --noconfirm git zsh gvim wget arch-audit lightdm lightdm-webkit2-greeter xorg-server xf86-video-intel i3-gaps xorg-xbacklight xorg-xrandr i3lock-color alsa-utils pulseaudio pulseaudio-alsa pulseaudio-bluetooth playerctl pavucontrol exfat-utils udiskie blueman acpi acpid tlp compton conky rxvt-unicode networkmanager network-manager-applet networkmanager-openconnect networkmanager-openvpn stow maim openssh xdotool xclip thunderbird firefox veracrypt keepassxc texlive-most evince pandoc pdfgrep adobe-source-han-sans-otc-fonts python3 python3-pip ranger atool elinks ffmpegthumbnailer highlight libcaca lynx mediainfo odt2txt perl-image-exiftool poppler python-chardet transmission-cli w3m +pacman -S --noconfirm git zsh gvim wget arch-audit lightdm lightdm-webkit2-greeter xorg-server xf86-video-intel i3-gaps xorg-xbacklight xorg-xrandr i3lock-color alsa-utils pulseaudio pulseaudio-alsa pulseaudio-bluetooth playerctl pavucontrol exfat-utils udiskie blueman acpi acpid tlp compton conky rxvt-unicode networkmanager network-manager-applet networkmanager-openconnect networkmanager-openvpn stow maim openssh xdotool xclip thunderbird firefox veracrypt keepassxc texlive-most evince pandoc pdfgrep adobe-source-han-sans-otc-fonts python3 python-pip ranger atool elinks ffmpegthumbnailer highlight libcaca lynx mediainfo odt2txt perl-image-exiftool poppler python-chardet transmission-cli w3m echo "%$sudogrp ALL=(ALL) ALL" >> /etc/sudoers groupadd "$sudogrp" -useradd -m -G "$sudogrp" -s "$username" +useradd -m -G "$sudogrp" -s /bin/zsh "$username" systemctl enable lightdm sed -i "s/#user-session.*/user-session=i3/g" /etc/lightdm/lightdm.conf @@ -78,6 +78,7 @@ su $username sh -c "/home/$username/fonts/install.sh" su $username sh -c "rm -rf /home/$username/fonts/" su $username sh -c "git clone git@gitlab.com:TuDatTr/dotfiles.git /home/$username/.dotfiles" -su $username sh -c "cd /home/$username/.dotfiles & stow vim" -su $username sh -c "cd /home/$username/.dotfiles & stow zsh" -su $username sh -c "cd /home/$username/.dotfiles & stow config" + +systemctl disable march + +wall "March done."