_) echo UBUNTU FOCAL64 VOL_FOCAL FOCAL ;;
# jammy
_) echo UBUNTU JAMMY64 VOL_JAMMY JAMMY ;;
- # NOBLE
- _) echo UBUNTU NOBLE64 VOL_NOBLE NOBLE ;;
+ # NOBLE # there also exists NOBLE_NONFREE
+ _) echo UBUNTU NOBLE64 VOL_NOBLE NOBLE NOBLE_FREE;;
esac
fi
###### end Template for 51-multi-boot ######
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-# input eg: /dev/sda1 or /dev/sda
-# output: /dev/disk/by-id/model+serial, or if no link exists, the same as input
+# input: /dev/DISK[PARTITION]...
+# eg: /dev/sdb1 /dev/sda
+# output example:
+# /dev/disk/by-id/model+serial-part1
+# /dev/disk/by-id/model+serial
+#
+# If no symlink exists, output is the same as input.
short_dev=$1
if [[ ! -e $short_dev ]]; then
fi
au user2
-if ifclass frodo; then
- sed 's/^/user2:/' /q/root/shadow/user2 | $ROOTCMD chpasswd -e
-fi
+# dont have any active user2 atm.
+# if ifclass frodo; then
+# sed 's/^/user2:/' /q/root/shadow/user2 | $ROOTCMD chpasswd -e
+# fi
# comparing iank's groups to user2, I see none she should join on arch
$ROOTCMD usermod -a -G user2 iank
wiredx=1
declare -a args
+if ! type -p ethtool &>/dev/null; then
+ apt-get -y install ethtool
+fi
+
+if ! type -p dig &>/dev/null; then
+ apt-get -y install dig
+fi
+
# device that has an eth0, but we aren't using it because it is
# broken. We could just hardcode a mac comparison with `cat
# /sys/class/net/eth0/address` but this is cooler.
fi
-if ! type -p dig &>/dev/null; then
- apt-get -y install dig
-fi
-
-if ! type -p ethtool &>/dev/null; then
- apt-get -y install ethtool
-fi
-
-
get-cur
## end common setup / detection ##
-NOBLE
\ No newline at end of file
+NOBLE_FREE
\ No newline at end of file
deb-src http://archive.ubuntu.com/ubuntu/ noble-security main universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ noble-updates main universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ noble-backports main universe
-deb http://packages.linuxmint.com wilma upstream
--- /dev/null
+# multiverse needed for libfdk-aac1, which is actually free
+# https://www.gnu.org/licenses/license-list.html#fdk
+
+###### Ubuntu Main Repos
+deb http://archive.ubuntu.com/ubuntu/ noble main universe multiverse restricted
+deb-src http://archive.ubuntu.com/ubuntu/ noble main universe multiverse restricted
+
+###### Ubuntu Update Repos
+deb http://archive.ubuntu.com/ubuntu/ noble-security main universe multiverse restricted
+deb http://archive.ubuntu.com/ubuntu/ noble-updates main universe multiverse restricted
+deb http://archive.ubuntu.com/ubuntu/ noble-backports main universe restricted
+deb-src http://archive.ubuntu.com/ubuntu/ noble-security main universe multiverse restricted
+deb-src http://archive.ubuntu.com/ubuntu/ noble-updates main universe multiverse restricted
+deb-src http://archive.ubuntu.com/ubuntu/ noble-backports main universe restricted
iw
# for the fai partitioning script
parted dosfstools
+# for pee
+moreutils
# iank, copied from DEBIAN so it goes into ubuntu too
PACKAGES install GRUB_PC
mount -o bind $src $dst
fi
-
+chmod 700 /mnt/root
$FAI/distro-install-common/end
# https://nouveau.freedesktop.org/InstallNouveau.html
# And now in t11, things got worse with a newer card also not loading
# nouveau when it did in t10.
-if lspci|grep -q 'VGA compatible controller: NVIDIA'; then
+if [[ $HOSTNAME != frodo ]] && lspci|grep -q 'VGA compatible controller: NVIDIA'; then
mkdir -p $target/etc/X11/xorg.conf.d/
cat >$target/etc/X11/xorg.conf.d/10-nouveau.conf <<'EOF'
Section "Device"
# /usr/share/initramfs-tools/hooks/btrfs
# /usr/share/initramfs-tools/scripts/local-premount/btrfs
# everything else, seems better to take from upstream package.
-for f in $(dpkg-query -L btrfs-progs | gr '/man/|^/s?bin/|^/usr/lib/udev') ; do
+for f in $(dpkg-query -L btrfs-progs | grep '/man/|^/s?bin/|^/usr/lib/udev') ; do
if [[ ! -f $f ]]; then
continue
fi
bp_dirname=btrfs-progs-t11
fi
else
+ # from packages listed in .github/workflows/devel.yml
+ # The dumb makefile makes us build docs even if they were already built.
+ if ! type -p sphinx-build &>/dev/null; then
+ $ROOTCMD apt-get -y install python3-sphinx-rtd-theme
+ fi
+
+ python3-sphinx-rtd-theme
bp_dirname=btrfs-progs-release
# latest released version.
pre=https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs
if [[ $FAI_ROOT == / ]]; then
cd $bp_dir
make install
- mv /usr/bin/{fsck,mkfs}.btfs /usr/sbin/
+ mv /usr/bin/{fsck,mkfs}.btrfs /usr/sbin/
else
mkdir -p $target/tmp/bprogs
mount -o bind $bp_dir $target/tmp/bprogs
# use fai repo. it's commented in the defaults. it's got bug fixes.
# and may contain newer packages.
deb http://fai-project.org/download $base koeln
+deb http://ftp.debian.org/debian $base-backports main contrib
EOF
-## Get latest kernel and btrfs for dealing with btrfs issues.
-# if [[ $base == buster ]]; then
-# cat >>/etc/fai/apt/sources.list <<'EOF'
-# deb http://ftp.debian.org/debian buster-backports main
-# EOF
-# # note, fai doesn\'t look at /etc/fai/apt/preferences.d
-# cat >/etc/fai/apt/preferences <<'EOF'
-# Package: linux-* firmware-linux-free btrfs-progs
-# Pin: release a=buster-backports
-# Pin-Priority: 500
-# EOF
-# fi
-
+cat >/etc/fai/apt/preferences <<EOF
+Package: *
+Pin: release n=$base-backports
+Pin-Priority: 500
+EOF
if [[ -s /q/root/shadow/standard ]]; then
$sed -f - /etc/fai/nfsroot.conf <<EOF
option src wan
option src_dport 80
option dest lan
- option dest_ip $l.$http_ip
+ option dest_ip $http_ip
option proto tcp
config rule
option src wan
option src wan
option src_dport 443
option dest lan
- option dest_ip $l.$http_ip
+ option dest_ip $http_ip
option proto tcp
config rule
option src wan
option target ACCEPT
option dest_port 9091
+
+
# was working on an openvpn server, didn't finish
# config redirect
# option name vpnkd
iankelling.org / git / automated-distro-installer / commitdiff