diff --git a/bin/make-rocky b/bin/make-rocky index d5249ac..fefbc56 100755 --- a/bin/make-rocky +++ b/bin/make-rocky @@ -1,6 +1,7 @@ #!/bin/bash # requires lorax, genisoimage: dnf install lorax genisoimage +isopath=/nfs/sw/os/rocky/Rocky-9.7-x86_64-minimal.iso die() { echo "$(basename $0): [die] $@" >&2 ; exit 1 ; } @@ -9,4 +10,3 @@ rpm -q --quiet genisoimage || die "genisoimage not installed" mkksiso --ks=/var/www/kickstart/rocky-9.cfg Rocky-9.7-x86_64-minimal.iso custom.iso - diff --git a/kickstart/rocky-9.cfg b/kickstart/rocky-9.cfg index 4ea32af..24466c7 100644 --- a/kickstart/rocky-9.cfg +++ b/kickstart/rocky-9.cfg @@ -36,20 +36,11 @@ touch /tmp/rpms /tmp/settings # Settings from config file rootpw='$6$OJEdzUbqfQR72WjX$SFMnDZ0MXM7JfYKPvvN0nJIPetzrWQw/0q360xgR9mwJVwrme4dt9hhtH95yytn8Ln0.0koVCno6vskylJFm5.' -tz='Europe/Amsterdam' - set -- `cat /proc/cmdline` for I in $*; do case "$I" in *=*) eval ${I//inst\./} ;; esac; done grep -qws "debug" /proc/cmdline && bash -# Get release by probing libc -# EL 6 does not support bootdisk on XFS, only use it for everything else -case $(ls /lib64/libc-*|head -1) in - *2.12*) fs=ext4 ; mp=/mnt/source ;; - *) fs=xfs ; mp=/run/install/repo ;; -esac - # boot disk detection printf "%-10s%10s%10s%10s\n" dev size removable inuse for dev in $(find /sys/block/ -name "sd?" -o -name "xvd?" -o -name "vd?"|sort); do @@ -71,18 +62,18 @@ if test -d /sys/firmware/efi; then else cat <<- EOF >> /tmp/settings bootloader --location=mbr - part /boot --fstype=$fs --size=768 + part /boot --fstype=xfs --size=1024 EOF fi cat <<- EOF >> /tmp/settings - timezone ${tz:---utc UTC} + timezone 'Europe/Amsterdam' ignoredisk --only-use=${bootdisk:-none} part pv.2 --grow --size=200 --maxsize=65536 volgroup rvg --pesize=4096 pv.2 - logvol / --fstype=$fs --name=root --vgname=rvg --size=1024 + logvol / --fstype=xfs --name=root --vgname=rvg --size=1024 logvol /opt --fstype=xfs --name=opt --vgname=rvg --size=512 - logvol /var --fstype=xfs --name=var --vgname=rvg --size=2048 + logvol /var --fstype=xfs --name=var --vgname=rvg --size=4096 logvol /usr --fstype=xfs --name=usr --vgname=rvg --size=4096 logvol /home --fstype=xfs --name=home --vgname=rvg --size=1024 logvol /tmp --fstype=xfs --name=tmp --vgname=rvg --size=1024 @@ -116,12 +107,5 @@ cat <<- EOF >> /root/.ssh/authorized_keys EOF chmod 400 /root/.ssh/authorized_keys -chvt 2 -iotty=$(tty) -exec > "$iotty" 2>&1 < "$iotty" - -read -p "Enter hostname: " hn -hostnamectl hostname $hn - %end