From 74054d9634f1f1b7335a6d3934b46073082c1f13 Mon Sep 17 00:00:00 2001 From: sean Date: Tue, 9 Jul 2019 14:57:20 -0700 Subject: [PATCH] tweaks --- setup-chroot.sh | 85 ++++++++++++++++++++++++++++++++++++++++++++++++- setup.sh | 67 +------------------------------------- 2 files changed, 85 insertions(+), 67 deletions(-) diff --git a/setup-chroot.sh b/setup-chroot.sh index 6f6cd21..0acf22c 100644 --- a/setup-chroot.sh +++ b/setup-chroot.sh @@ -1,3 +1,86 @@ #! /bin/bash -echo "chroot!!!" + +echo "" +echo "Mounting /proc/self/mounts..." +ln -s /proc/self/mounts /etc/mtab +echo "Done." + +echo "" +echo "Updating apt repositories inside chroot..." +errors=`apt update 2>&1 1>/dev/null` +if ! [ "$?" = "0" ]; then + echo "Failed to update apt repositories inside chroot - $errors" + exit 1 +fi +echo "Done." + +echo "" +echo "Setting locale..." +echo -e 'LANG="en_US.UTF-8"\nLANGUAGE="en_US:en"\n' > /etc/default/locale +echo "Done." + + +#dpkg-reconfigure tzdata +#apt install -y --no-install-recommends linux-image-generic +#apt install -y vim bash screen tmux zfs-initramfs dosfstools openssh-server +i="0" +for disk in "$disks"; do + echo "mkdosfs -F 32 -s 1 -n EFI /dev/disk/by-id/${disk}-part2" + echo "mkdir /boot/efi${i}" + echo "echo PARTUUID=$(blkid -s PARTUUID -o value /dev/disk/by-id/${disk}-part2) /boot/efi${i} vfat nofail,x-systemd.device-timeout=0 0 1 >> /etc/fstab" + echo "mount /boot/efi${i}" + i=$((i + 1)) +done + +#apt install -y grub-efi-amd64-signed shim-signed +#passwd + +#echo "[Unit]\n DefaultDependencies=no\n Before=zfs-import-scan.service\n Before=zfs-import-cache.service\n \n [Service]\n Type=oneshot\n RemainAfterExit=yes\n ExecStart=/sbin/zpool import -N -o cachefile=none bpool\n [Install]\n WantedBy=zfs-import.target " > /etc/systemd/system/zfs-import-bpool.Service" +#systemctl enable zfs-import-bpool.Service + +#cp /usr/sharesystemd/tmp.mount /etc/systemd/system/ +#systemctl enable tmp.mount +#addgroup --system lpadmin +#addgroup --system sambashare + +#zfscheck=`grub-probe /boot` +#update-initramfs -u -k all + +# you need sed to do this right! +# GRUB_CMDLINE_LINUX="root=ZFS=rpool/ROOT/ubuntu" <--- replace this + +#update-grub +#i="0" +#for f in "$disks"; do + #echo "grub-install --target=x86_64-efi --efi-directory=/boot/efi${i} --botloader-id=ubuntu --recheck --no-floppy" + #echo "umount /boot/efi${i}" + #i=$((i + 1)) +#done + +#zfs set mountpoint=legacy bpool/BOOT/ubuntu +#echo bpool/BOOT/ubuntu /boot zfs nodev,relatime,x-systemd.requires=zfs-import-bpool.service 0 0 >> /etc/fstab +#zfs set mountpoint=legacy rpool/var/log +#echo rpool/var/log /var/log zfs nodev,relatime 0 0 >> /etc/fstab +#zfs set mountpoint=legacy rpool/var/spool +#echo rpool/var/spool /var/spool zfs nodev,relatime 0 0 >> /etc/fstab +#zfs set mountpoint=legacy rpool/var/tmp +#echo rpool/var/tmp /var/tmp zfs nodev,relatime 0 0 >> /etc/fstab +#zfs set mountpoint=legacy rpool/tmp +#echo rpool/tmp /tmp zfs nodev,relatime 0 0 >> /etc/fstab +#systemctl enable openssh-server + + + +# create parker user automated way +#zfs create rpool/home/YOURUSERNAME +# adduser YOURUSERNAME +# cp -a /etc/skel/.[!.]* /home/YOURUSERNAME +# chown -R YOURUSERNAME:YOURUSERNAME /home/YOURUSERNAME +# usermod -a -G adm,cdrom,dip,lpadmin,plugdev,sambashare,sudo YOURUSERNAME + +#create swap space, too if necessary + + + + exit 0 \ No newline at end of file diff --git a/setup.sh b/setup.sh index 750228b..690c0ee 100644 --- a/setup.sh +++ b/setup.sh @@ -167,6 +167,7 @@ echo "Done." echo "" echo "Downloading chroot configuration script..." wget -qO - https://code.totosearch.org/Sean/ServerSetup/raw/branch/master/setup-chroot.sh > /mnt/setup-chroot.sh +chmod +x /mnt/setup-chroot.sh echo "Done." chroot /mnt /setup-chroot.sh --login @@ -191,72 +192,6 @@ echo "Done." exit 0 -# ln -s /proc/self/mounts /etc/mtab -# apt update - -#echo -e 'LANG="en_US.UTF-8"\nLANGUAGE="en_US:en"\n' > /etc/default/locale -#dpkg-reconfigure tzdata -#apt install -y --no-install-recommends linux-image-generic -#apt install -y vim bash screen tmux zfs-initramfs dosfstools openssh-server -i="0" -for disk in "$disks"; do - echo "mkdosfs -F 32 -s 1 -n EFI /dev/disk/by-id/${disk}-part2" - echo "mkdir /boot/efi${i}" - echo "echo PARTUUID=$(blkid -s PARTUUID -o value /dev/disk/by-id/${disk}-part2) /boot/efi${i} vfat nofail,x-systemd.device-timeout=0 0 1 >> /etc/fstab" - echo "mount /boot/efi${i}" - i=$((i + 1)) -done - -#apt install -y grub-efi-amd64-signed shim-signed -#passwd - -#echo "[Unit]\n DefaultDependencies=no\n Before=zfs-import-scan.service\n Before=zfs-import-cache.service\n \n [Service]\n Type=oneshot\n RemainAfterExit=yes\n ExecStart=/sbin/zpool import -N -o cachefile=none bpool\n [Install]\n WantedBy=zfs-import.target " > /etc/systemd/system/zfs-import-bpool.Service" -#systemctl enable zfs-import-bpool.Service - -#cp /usr/sharesystemd/tmp.mount /etc/systemd/system/ -#systemctl enable tmp.mount -#addgroup --system lpadmin -#addgroup --system sambashare - -zfscheck=`grub-probe /boot` -#update-initramfs -u -k all - -# you need sed to do this right! -# GRUB_CMDLINE_LINUX="root=ZFS=rpool/ROOT/ubuntu" <--- replace this - -#update-grub -i="0" -for f in "$disks"; do - echo "grub-install --target=x86_64-efi --efi-directory=/boot/efi${i} --botloader-id=ubuntu --recheck --no-floppy" - echo "umount /boot/efi${i}" - i=$((i + 1)) -done - -#zfs set mountpoint=legacy bpool/BOOT/ubuntu -#echo bpool/BOOT/ubuntu /boot zfs nodev,relatime,x-systemd.requires=zfs-import-bpool.service 0 0 >> /etc/fstab -#zfs set mountpoint=legacy rpool/var/log -#echo rpool/var/log /var/log zfs nodev,relatime 0 0 >> /etc/fstab -#zfs set mountpoint=legacy rpool/var/spool -#echo rpool/var/spool /var/spool zfs nodev,relatime 0 0 >> /etc/fstab -#zfs set mountpoint=legacy rpool/var/tmp -#echo rpool/var/tmp /var/tmp zfs nodev,relatime 0 0 >> /etc/fstab -#zfs set mountpoint=legacy rpool/tmp -#echo rpool/tmp /tmp zfs nodev,relatime 0 0 >> /etc/fstab -#systemctl enable openssh-server - - - -# create parker user automated way -#zfs create rpool/home/YOURUSERNAME -# adduser YOURUSERNAME -# cp -a /etc/skel/.[!.]* /home/YOURUSERNAME -# chown -R YOURUSERNAME:YOURUSERNAME /home/YOURUSERNAME -# usermod -a -G adm,cdrom,dip,lpadmin,plugdev,sambashare,sudo YOURUSERNAME - -#create swap space, too if necessary - - - #exit #mount | grep -v zfs | tac | awk '/\/mnt/ {print $3}' | xargs -i{} umount -lf {}