Fixes for tar generation
This commit is contained in:
dev
parent
e82614a279
commit
5ea18518ef
|
|
@ -5,8 +5,17 @@ echoroot:
|
|||
@echo ${HTTPROOT}
|
||||
@echo ${HTTPUSER}
|
||||
|
||||
compile:
|
||||
@echo Nothing to do.
|
||||
|
||||
install: script webpresent
|
||||
|
||||
test:
|
||||
./shadowarch -h
|
||||
|
||||
reverse:
|
||||
cp ${HTTPROOT}/shadowarch .
|
||||
|
||||
webpresent: shadowarch
|
||||
/root/bin/shadowarch-tar-gen
|
||||
cp ./shadowarch ${HTTPROOT}
|
||||
|
|
@ -17,7 +26,4 @@ script: shadowarch-tar-gen
|
|||
chmod 0700 /root/bin/shadowarch-tar-gen
|
||||
chown root:root /root/bin/shadowarch-tar-gen
|
||||
|
||||
configure:
|
||||
vim Makefile
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,24 +8,34 @@ function header () {
|
|||
return
|
||||
}
|
||||
function help() {
|
||||
echo Usage: ${0} '[-s] [-e]'
|
||||
echo '\-s Create a layout for an AniNIX::Spartacus'
|
||||
echo '\-e Encrypt the root partition'
|
||||
echo Usage: ${0} '[-d /dev/somedisk] [-e] [-g] [-p] [-s]'
|
||||
echo " ${0}" '-h'
|
||||
echo '-d Specify disk to install to.'
|
||||
echo '-e Encrypt the root partition'
|
||||
echo '-g Add GUI packages'
|
||||
echo '-h Get help'
|
||||
echo '-p Add productivity packages'
|
||||
echo '-s Create a layout for an AniNIX::Spartacus'
|
||||
exit 1;
|
||||
}
|
||||
|
||||
spartacus=0;
|
||||
encrypt=0;
|
||||
gui=0;
|
||||
productivity=0;
|
||||
disk="/dev/sda"
|
||||
bootpart=1;
|
||||
rootpart=2;
|
||||
datapart=99;
|
||||
while getopts "sed:" OPTION
|
||||
# TODO Add LVM as an argument
|
||||
while getopts "ed:ghps" OPTION
|
||||
do
|
||||
case $OPTION in
|
||||
s) spartacus=1 ;;
|
||||
e) encrypt=1 ;;
|
||||
d) disk=${OPTARG} ;;
|
||||
g) gui=1 ;;
|
||||
p) productivity=1; gui=1 ;;
|
||||
s) spartacus=1 ;;
|
||||
*) help
|
||||
esac
|
||||
done
|
||||
|
|
@ -33,6 +43,8 @@ done
|
|||
header Confirm options:
|
||||
echo Spartacus set to: $spartacus
|
||||
echo Encryption set to: $encrypt
|
||||
echo GUI: $gui
|
||||
echo Productivity: $productivity
|
||||
echo Disk to use: $disk
|
||||
printf "Is this OK? Type YES to continue: "
|
||||
read answer
|
||||
|
|
@ -40,11 +52,9 @@ if [ "$answer" != "YES" ]; then
|
|||
echo User did not confirm.
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
## REMOVE this section to not format the first disk. You will have to layout your own space. ##
|
||||
|
||||
pacman -Syy
|
||||
header Allocating space
|
||||
shred -n 1 -v --random-source=/dev/zero "$disk"
|
||||
dd if=/dev/zero of="$disk" bs=1 count=2000000 # "$(fdisk -l "$disk" | head -n 1 | cut -f 5 -d ' ')"
|
||||
if [ $spartacus -eq 1 ]; then
|
||||
# Insert an ExFAT data partition ahead of the rest.
|
||||
export datapart=1;
|
||||
|
|
@ -58,7 +68,7 @@ if [ $spartacus -eq 1 ]; then
|
|||
export datasize=$(($disksize / 2))
|
||||
printf 'mklabel msdos\nmkpart primary ext4 1MiB %s\nmkpart primary ext4 %s %s\nmkpart primary ext4 %s 100%%FREE\nprint\nquit\n' $datasize"MiB" $datasize"MiB" $(($datasize+$bootsize))"MiB" $(($datasize+$bootsize))"MiB" | parted "$disk"
|
||||
#create data partition
|
||||
pacman -Sy exfat-utils --noconfirm
|
||||
pacman -S exfat-utils --noconfirm
|
||||
mkfs.exfat "$disk""$datapart"
|
||||
exfatlabel "$disk""$datapart" "AS-XPLATFRM"
|
||||
else
|
||||
|
|
@ -78,32 +88,44 @@ if [ $encrypt -eq 1 ]; then
|
|||
cryptsetup luksFormat -c serpent-xts-plain64 -h sha512 --key-size 512 "$disk""$rootpart"
|
||||
header Unlocking root
|
||||
cryptsetup luksOpen "$disk""$rootpart" cryptroot
|
||||
mkfs.xfs /dev/mapper/cryptroot
|
||||
mkfs.xfs -f /dev/mapper/cryptroot
|
||||
xfs_admin -L ROOT /dev/mapper/cryptroot
|
||||
mount /dev/mapper/cryptroot /mnt
|
||||
if [ $? -ne 0 ]; then header ERROR: Cannot continue; exit 1; fi
|
||||
else
|
||||
header Making root on "$disk""$rootpart"
|
||||
mkfs.xfs "$disk""$rootpart"
|
||||
mkfs.xfs -f "$disk""$rootpart"
|
||||
xfs_admin -L ROOT "$disk""$rootpart"
|
||||
mount "$disk""$rootpart" /mnt
|
||||
if [ $? -ne 0 ]; then header ERROR: Cannot continue; exit 1; fi
|
||||
fi
|
||||
|
||||
mkdir /mnt/boot
|
||||
mount "$disk""$bootpart" /mnt/boot
|
||||
|
||||
## END REMOVE ##
|
||||
if [ $? -ne 0 ]; then header ERROR: Cannot continue; exit 1; fi
|
||||
|
||||
# Install ArchLinux with basic clients for the AniNIX Services.
|
||||
# * git for AniNIX::Bazaar
|
||||
# * git for Foundation
|
||||
# * lynx for WebServer and Wiki
|
||||
# * openssh for SSH/SFTP
|
||||
# * irssi for IRC
|
||||
# * make for source packages
|
||||
# * tor for anonymity
|
||||
# Uncomment the remaining packages for a desktop environment.
|
||||
header Installing ArchLinux to root
|
||||
yes "" | pacstrap -i /mnt base base-devel grub efibootmgr openssh git make lynx irssi vim wget tor torsocks # xorg-server xfce4 seamonkey
|
||||
export pkglist="base base-devel parted net-tools bind-tools git openssh make lynx irssi vim wget tor torsocks grub os-prober"
|
||||
if [ $gui -eq 1 ]; then
|
||||
export pkglist="$pkglist"" xorg-server xfce4 seamonkey conky"
|
||||
fi
|
||||
if [ $spartacus -eq 1 ]; then
|
||||
export pkglist="$pkglist"" exfat-utils"
|
||||
fi
|
||||
if [ $productivity -eq 1 ]; then
|
||||
export pkglist="$pkglist"" libreoffice-still gimp feh vlc evince"
|
||||
fi
|
||||
|
||||
yes "" | pacstrap -i /mnt $pkglist
|
||||
if [ $? -ne 0 ]; then header ERROR: Cannot continue; exit 1; fi
|
||||
|
||||
header Create FSTAB
|
||||
genfstab -U /mnt >> /mnt/etc/fstab
|
||||
|
||||
|
|
@ -114,15 +136,19 @@ ln -s /usr/share/zoneinfo/America/Chicago /mnt/etc/localtime
|
|||
arch-chroot /mnt hwclock --systohc --utc
|
||||
|
||||
header Setup bootloader
|
||||
export rootuuid="$(blkid "$disk""$rootpart" | cut -f 2 -d '"')"
|
||||
if [ $encrypt -eq 1 ]; then
|
||||
export hookstring="$(grep 'HOOKS=' /mnt/etc/mkinitcpio.conf | grep -v '#')"
|
||||
sed -i 's#'"$hookstring"'#HOOKS="base udev autodetect modconf block encrypt filesystems keyboard fsck"#' /mnt/etc/mkinitcpio.conf
|
||||
export rootuuid="$(blkid "$disk""$rootpart" | cut -f 2 -d '"')"
|
||||
sed -i 's#GRUB_CMDLINE_LINUX=""#GRUB_CMDLINE_LINUX="cryptdevice=UUID='$rootuuid':cryptroot root=/dev/mapper/cryptroot"' /etc/default/grub
|
||||
sed -i 's#GRUB_CMDLINE_LINUX=""#GRUB_CMDLINE_LINUX="cryptdevice=UUID='$rootuuid':cryptroot"#' /mnt/etc/default/grub
|
||||
fi
|
||||
|
||||
arch-chroot /mnt mkinitcpio -p linux
|
||||
if [ $? -ne 0 ]; then header ERROR: Cannot continue; exit 1; fi
|
||||
arch-chroot /mnt grub-install --target=i386-pc "$disk"
|
||||
arch-chroot /mnt grub-mkconfig -o /boot/grub/grub-cfg
|
||||
if [ $? -ne 0 ]; then header ERROR: Cannot continue; exit 1; fi
|
||||
arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg
|
||||
if [ $? -ne 0 ]; then header ERROR: Cannot continue; exit 1; fi
|
||||
|
||||
header Set networking
|
||||
arch-chroot /mnt systemctl enable netctl
|
||||
|
|
@ -136,17 +162,44 @@ arch-chroot /mnt netctl enable $interface
|
|||
# Set prompt and vimrc for ShadowArch
|
||||
header Setting ShadowArch customizations.
|
||||
echo 'PS1="\[\033[00;31m\][ AniNIX::\h(\[\033[01;32m\]ShadowArch\[\033[00;31m\]) \[\033[00;36m\]\u \[\033[01;37m\]\d \T \[\033[00;35m\]\w\[\033[00;31m\] ] \n|\[\033[m\]> "' >> /mnt/etc/bash.bashrc
|
||||
# TODO Find a way to set the terminal header properly
|
||||
#for i in $(grep PROMPT_COMMAND /mnt/etc/bash.bashrc); do
|
||||
# sed -i 's/'"$i"'/PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'"'"'printf "\033]0;AniNIX::%s \134\134 %s in %s\007" "${HOSTNAME%%.*}" "${USER}" "${PWD/#$HOME/\~}"'"'"'/g' /etc/bash.bashrc
|
||||
#done
|
||||
sed -i '/PS1=/d' /mnt/etc/skel/.bashrc
|
||||
cd /mnt/etc/
|
||||
wget https://aninix.net/shadowarch.tar
|
||||
rm -Rf /etc/skel /etc/vimrc
|
||||
tar xvf shadowarch.tar
|
||||
rm -Rf ./skel ./vimrc
|
||||
tar xvf /mnt/etc/shadowarch.tar
|
||||
cd /mnt/root
|
||||
tar xvf /mnt/etc/shadowarch.tar
|
||||
rm shadowarch.tar
|
||||
|
||||
|
||||
ln -s /etc/skel/.bashrc /mnt/root/.bashrc
|
||||
|
||||
# Set hostname
|
||||
header Set hostname
|
||||
printf "What is your hostname? AniNIX::"
|
||||
read hostname
|
||||
echo "$hostname" > /mnt/etc/hostname
|
||||
|
||||
# Set password
|
||||
header Set new root passphrase
|
||||
arch-chroot /mnt passwd
|
||||
|
||||
# Clone ConfigPackags from AniNIX::Foundation
|
||||
arch-chroot /mnt git -C /usr/local/src/ clone https://aninix.net/foundation/ConfigPackages
|
||||
|
||||
if [ $gui -eq 1 ]; then
|
||||
echo "Remember to install your graphics drivers!
|
||||
For NVidia, look at xf86-video-nouveau
|
||||
For AMD, look at xf86-video-amdgpu
|
||||
For Hyper-V, look at xf86-video-fbdev
|
||||
For Virtual Box, look at virtualbox-guest-utils
|
||||
For VMware, look at open-vm-tools"
|
||||
fi
|
||||
|
||||
header Installed ShadowArch! Press enter to reboot.
|
||||
read
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue