diff --git a/CH9Config/00-Generic.sh b/CH9Config/00-Generic.sh index 8b29d75..04d1d27 100644 --- a/CH9Config/00-Generic.sh +++ b/CH9Config/00-Generic.sh @@ -64,3 +64,26 @@ cat > /etc/shells << "EOF" # End /etc/shells EOF + +# modprobe.d + +install -m755 -d /etc/modprobe.d + +cat > /etc/modprobe.d/usb.conf << "EOF" +# Begin /etc/modprobe.d/usb.conf + +install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe -i ohci_hcd ; true +install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe -i uhci_hcd ; true + +# End /etc/modprobe.d/usb.conf +EOF +cat > /etc/modprobe.d/usb.conf << "EOF" +# Begin /etc/modprobe.d/blacklist.conf + +blacklist nouveau +options nouveau modset=0 + +# End /etc/modprobe.d/blacklist.conf +EOF + + diff --git a/CH9Config/01-NetworkConfig.sh b/CH9Config/01-NetworkConfig.sh index 71fb20c..80748f1 100644 --- a/CH9Config/01-NetworkConfig.sh +++ b/CH9Config/01-NetworkConfig.sh @@ -42,10 +42,11 @@ Name=lan0 [Network] DHCP=ipv4 EOF - # auto-update certificate bundle + # auto-update "make-ca" certificate bundle systemctl enable update-pki.timer else # bootable USB thumb drive echo "lfsusb" > /etc/hostname - systemctl disable systemd-networkd-wait-online + #systemctl disable systemd-networkd-wait-online + systemctl disable systemd-networkd fi diff --git a/CH9Config/01-USBFlash.sh b/CH9Config/01-USBFlash.sh index 8445241..a467136 100644 --- a/CH9Config/01-USBFlash.sh +++ b/CH9Config/01-USBFlash.sh @@ -1,13 +1,5 @@ #!/bin/bash -# Do not try to bring up the network when booted from a thumb drive - -systemctl disable systemd-networkd-wait-online - -# hostname - -echo "lfsusb" > /etc/hostname - # LFS user groupadd lfs