tudattr/march
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed file paths for march-reboot.sh by copying them in install.sh over to the target system

Browse Source
This commit is contained in:
TuDatTr
2020-05-24 06:24:40 +02:00
parent fe3e3eb5ee
commit db7e8a7203
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
install.sh
View File

@@ -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-chroot.sh /mnt/root/march-chroot.sh
cp $CWD/root/march-reboot.sh /mnt/root/march-reboot.sh cp $CWD/root/march-reboot.sh /mnt/root/march-reboot.sh
chmod +x /mnt/root/march-chroot.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 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" arch-chroot /mnt /root/march-chroot.sh -t "$timezone" -l "$locale" -h "$hostname" -u "$username" -s "$sudogrp" -c "$cryptroot" -r "$rootpart"

11
root/march-reboot.sh
View File

@@ -54,11 +54,11 @@ while true; do
esac esac
done 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 echo "%$sudogrp ALL=(ALL) ALL" >> /etc/sudoers
groupadd "$sudogrp" groupadd "$sudogrp"
useradd -m -G "$sudogrp" -s "$username" useradd -m -G "$sudogrp" -s /bin/zsh "$username"
systemctl enable lightdm systemctl enable lightdm
sed -i "s/#user-session.*/user-session=i3/g" /etc/lightdm/lightdm.conf 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 "rm -rf /home/$username/fonts/"
su $username sh -c "git clone git@gitlab.com:TuDatTr/dotfiles.git /home/$username/.dotfiles" 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" systemctl disable march
su $username sh -c "cd /home/$username/.dotfiles & stow config"
wall "March done."