From 91c828ee147ba62ea5c614912e24ed63a5014e02 Mon Sep 17 00:00:00 2001
From: Ludovic Pouzenc <ludovic@pouzenc.fr>
Date: Wed, 21 Aug 2019 23:21:26 +0200
Subject: Use DNS CNAME on nfs mount
---
make-boot-image.sh | 33 ++++++++++++---------------------
1 file changed, 12 insertions(+), 21 deletions(-)
diff --git a/make-boot-image.sh b/make-boot-image.sh
index 1d07478..88f3e68 100755
--- a/make-boot-image.sh
+++ b/make-boot-image.sh
@@ -17,7 +17,7 @@ ROOTCMD=sudo
WGET="wget" # "wget --no-check-certificate" could help but is a security concern
# Should be customized with your NFS server IP address or options
-NFS_MOUNT_CMDLINE="mount -v -t nfs -o nolock 172.16.2.28:/masters /mnt/nfs"
+NFS_MOUNT_CMDLINE="mount -v -t nfs -o nolock eficast-nfs.mines-albi.fr:/masters /mnt/nfs"
# You probably need to tweak version numbers in following URLs if you have an HTTP 404 - Not found error
#KERNEL_TARBALL_URL=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.2.9.tar.xz # ok in qemu, seems sane on real hardware
@@ -152,7 +152,7 @@ then check_free_space $ROOT_MIN_AVAIL_MIO /
# ncurses-bin : tput
$ROOTCMD apt-get install dmidecode pciutils usbutils lshw sysstat iftop strace rsync \
ntfs-3g e2fsprogs dosfstools exfat-utils partclone util-linux gdisk efibootmgr \
- pv bc figlet toilet-fonts ncurses-bin beep net-tools ethtool pigz tmux
+ pv bc figlet toilet-fonts ncurses-bin beep net-tools ethtool pigz tmux iperf
# Optionnal dependencies to put into the initrd
[ "x$INCLUDE_TCPDUMP" == "xy" ] && $ROOTCMD apt-get install tcpdump
> "$WORKDIR/apt-install-done"
@@ -247,12 +247,10 @@ while more_work and i < passes:
more_work = sset(sym) or more_work
if sym.name in ['EFI_VARS', 'DELL_RBU', 'USB_XHCI_HCD']:
more_work = sset(sym, 1) or more_work
- #more_work = sset(sym) or more_work
# Support FUSE, soft RAID (linux) and hard RAID (some cards)
if sym.name in ['FUSE_FS', 'DM_RAID', 'MEGARAID_SAS']:
more_work = sset(sym, 1) or more_work
- #more_work = sset(sym) or more_work
if sym.name in ['SCSI_LOWLEVEL', 'MEGARAID_NEWGEN']:
more_work = sset(sym) or more_work
@@ -267,15 +265,9 @@ while more_work and i < passes:
if True in [ ('drivers/net/ethernet' in node.filename) for node in sym.nodes ]:
if sym.assignable and 1 in sym.assignable:
more_work = sset(sym, 1) or more_work
- #if sym.assignable:
- # more_work = sset(sym) or more_work
-
- # Try to get everything in kernel, not as a module (1=='m')
- #if sym.tri_value == 1 and sym.assignable and 2 in sym.assignable:
- # more_work = sset(sym) or more_work
# Following tunings are not mandatory
- # Try at each pass but don't create an extra pass if anything else as asked for
+ # Try at each pass but don't create an extra pass if nothing else as asked for
# To "do" this, don't set more_work var
# If --debug passed as arg, make kernel aware of virtual drivers (used for testing eficast on qemu/kvm)
@@ -300,9 +292,6 @@ while more_work and i < passes:
if sym.name in ['IP_ADVANCED_ROUTER']:
sset(sym, 0)
-
-
-
# Write .config even if some symbols are unset
print(kconf.write_config(standard_config_filename()))
@@ -368,7 +357,7 @@ then (
set +x
PATH="$WORKDIR/kernel/tools/perf:/usr/sbin:/usr/bin:/sbin:/bin"
# Diagnostic tools
- mkchroot "$WORKDIR/initrd" dmidecode iftop iostat lshw lspci lsblk lsusb mpstat
+ mkchroot "$WORKDIR/initrd" dmidecode iftop iostat lshw lspci lsblk lsusb mpstat iperf
# Console tools and manpages display
mkchroot "$WORKDIR/initrd" tput setterm strace groff nroff troff grotty gtbl tmux bc pv figlet beep
# Filesystem tools
@@ -462,9 +451,11 @@ eficast_end() {
[ -r /run/eficast_end ] && action=$(cat /run/eficast_end)
case $action in
poweroff) read -t10 -p 'Ctrl+C to have a shell, Enter to skip wait time for poweroff...'
+ wait # if beep command is killed from sfx_success, internal speaker can't beep for a long anoying time
poweroff
;;
reboot) read -t10 -p 'Ctrl+C to have a shell, Enter to skip wait time for reboot...'
+ wait # if beep command is killed from sfx_success, internal speaker can't beep for a long anoying time
reboot
;;
*) echo "Dropping a shell (consider putting poweroff or reboot in /run/eficast_end)"
@@ -559,10 +550,10 @@ sound() {
beep $args
}
-sfx_question() { sound 2 50 $E7 2 $C7 2 $E7 2 $C7 3; }
-sfx_success() { sound 1 140 $E6 $G6 $E7 $C7 $D7 $G7 ; }
-sfx_failure() { sound 3 100 $C5 1 3 $G4 1 3 $E4 3 0 $A4 2 0 $B4 2 0 $A4 2 0 $Ab4 3 0 $Bb4 3 0 $Ab4 3 0 $G4 6 0 ; }
-sfx_starting() { sound 1 25 $C5 $G4 $C5 $E5 $G5 $C6 $G5 $Ab4 $C5 $Eb5 $Ab5 $Eb5 $Ab5 $C6 $Eb6 $Ab6 $Eb6 $Bb4 $D5 $F5 $Bb5 $D6 $F6 $Bb6 $F6 ; }
+sfx_question() { : ; }
+sfx_success() { sound 2 50 $E7 2 $C7 3; }
+sfx_failure() { sound 2 600 $G4 ; }
+sfx_starting() { : ; }
eval $(notes)
EOF
@@ -822,10 +813,10 @@ label eficast
append from=syslinux
label debug
kernel /EFI/BOOT/BOOTX64.EFI
- append debug ignore_loglevel bootmem_debug apic=debug show_lapic=all acpi.debug_layer=0xffffffff acpi.debug_level=0xffffffff debugpat initcall_debug pnp.debug=1 sched_debug
+ append debug ignore_loglevel bootmem_debug apic=debug show_lapic=all acpi.debug_layer=0xffffffff acpi.debug_level=0xffffffff debugpat initcall_debug pnp.debug=1 sched_debug from=syslinux
label noacpi
kernel /EFI/BOOT/BOOTX64.EFI
- append noacpi
+ append noacpi from=syslinux
timeout 10
prompt 1
EOT
--
cgit v1.2.3