From 202d3285422b7fbdff14abfb811cef6810311907 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 27 Jun 2016 16:34:01 +0200 Subject: [PATCH 1/3] new filter for webcams --- netlog/netlog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/netlog/netlog b/netlog/netlog index 8652d666..522444ba 100755 --- a/netlog/netlog +++ b/netlog/netlog @@ -143,7 +143,9 @@ sub filter { } /netlog test/ and return 'TEST'; - + + /WEBCAM/ and return 'CAM'; + $proc eq 'InRow RC' and return 'INROW'; if ($proc eq 'UPS') { return 'UPS' unless /(Started|Passed) a self-test./; From 13b8e0a2a4d9da1f8f88eb5b141d4844a3a83e5e Mon Sep 17 00:00:00 2001 From: david Date: Tue, 28 Jun 2016 11:50:20 +0200 Subject: [PATCH 2/3] grub.cfg is loking nice again:) --- mxgrub/mxgrub | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mxgrub/mxgrub b/mxgrub/mxgrub index 824d44da..b5e72bfa 100755 --- a/mxgrub/mxgrub +++ b/mxgrub/mxgrub @@ -160,7 +160,7 @@ sub update_grub_cfg { for my $label (@MARIUX) { my $image=label_to_image($label); - $kernellist.="menuentry \"$label\" --unrestricted { save_env chosen ; linux /boot/$image crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz }\n"; + $kernellist.="\tmenuentry \"$label\" --unrestricted { save_env chosen ; linux /boot/$image crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz }\n"; } my $GRUB_CFG_NEW=<<"EOF"; @@ -177,7 +177,7 @@ if [ -e /etc/local/USB.usb ]; then menuentry "mariuxUSB" --unrestricted { save_env chosen ; linux /boot/bzImage.x86_64 crashkernel=256M root=LABEL=rootusb ro ; initrd /boot/grub/initramfs.igz } else - $kernellist +$kernellist if [ \$chosen ]; then set default=\$chosen @@ -186,15 +186,15 @@ else fi EOF - if (-e '/boot/grub/grub.cfg') { - my $GRUB_CFG_OLD=read_file('/boot/grub/grub.cfg'); + if (-e './grub.cfg') { + my $GRUB_CFG_OLD=read_file('./grub.cfg'); if ($GRUB_CFG_NEW eq $GRUB_CFG_OLD) { # warn "/boot/grub/grub.cfg: no change\n"; return; } } - write_file_atomic('/boot/grub/grub.cfg',$GRUB_CFG_NEW); - warn "/boot/grub/grub.cfg: updated\n"; + write_file_atomic('./grub.cfg',$GRUB_CFG_NEW); + warn "./grub.cfg: updated\n"; } sub cmd_list { From 1db0840228c2eac803ba641a970b78bf79ed4d74 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 28 Jun 2016 11:55:19 +0200 Subject: [PATCH 3/3] grub.cfg looking nice again:) --- mxgrub/grub.cfg | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 mxgrub/grub.cfg diff --git a/mxgrub/grub.cfg b/mxgrub/grub.cfg new file mode 100644 index 00000000..58b10c6f --- /dev/null +++ b/mxgrub/grub.cfg @@ -0,0 +1,34 @@ + +set timeout=5 + +set superusers="root" +password_pbkdf2 root grub.pbkdf2.sha512.10000.A1168F03CC3CD47F79848E949584EA624FF531B53611F61218DC5BAD760E767063A96E6A5CE6B3506BAC28C5A2F9A7D491BDA770CC233BC9F464F33F8524FC79.EE4EF2EB7B2B8C2DD313300396179F5484CAA011D7CBF2A3FF886A372A6FF2DBC3B1AE59E05687B294D4B8F4674DA55CCE18EDBEB2635E4B6F2BE7C4EBC8916A + +set default="mariux-4.4.11-88" +load_env +if [ -e /etc/local/USB.usb ]; then + set default="mariuxUSB" + menuentry "mariuxUSB" --unrestricted { save_env chosen ; linux /boot/bzImage.x86_64 crashkernel=256M root=LABEL=rootusb ro ; initrd /boot/grub/initramfs.igz } +else + + menuentry "mariux-4.4.13-89" --unrestricted { save_env chosen ; linux /boot/bzImage-4.4.13.mx64.89 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-4.4.11-88" --unrestricted { save_env chosen ; linux /boot/bzImage-4.4.11.mx64.88 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-4.4.2-86" --unrestricted { save_env chosen ; linux /boot/bzImage-4.4.2.mx64.86 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-4.4.2-84" --unrestricted { save_env chosen ; linux /boot/bzImage-4.4.2.mx64.84 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-4.4.2-80" --unrestricted { save_env chosen ; linux /boot/bzImage-4.4.2.mx64.80 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-4.4.1-78" --unrestricted { save_env chosen ; linux /boot/bzImage-4.4.1.mx64.78 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-4.4.0-76" --unrestricted { save_env chosen ; linux /boot/bzImage-4.4.0.mx64.76 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-3.14.54-70" --unrestricted { save_env chosen ; linux /boot/bzImage-3.14.54.mx64.70 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-3.14.51-69" --unrestricted { save_env chosen ; linux /boot/bzImage-3.14.51.mx64.69 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-3.14.51-68" --unrestricted { save_env chosen ; linux /boot/bzImage-3.14.51.mx64.68 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-4.0.5-67" --unrestricted { save_env chosen ; linux /boot/bzImage-4.0.5.mx64.67 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-3.14.37-61" --unrestricted { save_env chosen ; linux /boot/bzImage-3.14.37.mx64.61 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-3.14.24-58" --unrestricted { save_env chosen ; linux /boot/bzImage-3.14.24.mx64.58 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + menuentry "mariux-3.10.29-54" --unrestricted { save_env chosen ; linux /boot/bzImage-3.10.29.mx64.54 crashkernel=256M root=LABEL=root ro ; initrd /boot/grub/initramfs.igz } + + + if [ $chosen ]; then + set default=$chosen + unset chosen # must be clear to get a clean value from menuentry + fi +fi