lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date:   Thu,  9 Nov 2017 14:09:11 +0800
From:   changbin.du@...el.com
To:     mingo@...hat.com, hpa@...or.com, tglx@...utronix.de
Cc:     x86@...nel.org, linux-kernel@...r.kernel.org,
        Changbin Du <changbin.du@...el.com>,
        Ingo Molnar <mingo@...nel.org>
Subject: [PATCH v2] x86, build: Make genimage.sh little more quite

From: Changbin Du <changbin.du@...el.com>

This change suppresses the 'dd' output and adds '-quite' parameter
to mkisofs tool. Also it removes 'Using ...' messages. None of the
messages matter to the user.

If user wants to be more verbose, he/she can use "make V=1" to debug
this script.

Now:
$ make isoimage
...
Kernel: arch/x86/boot/bzImage is ready  (#75)
  GENIMAGE arch/x86/boot/image.iso
Kernel: arch/x86/boot/image.iso is ready

Cc: Ingo Molnar <mingo@...nel.org>
Signed-off-by: Changbin Du <changbin.du@...el.com>

---
v2: To be more quite. (Ingo)
---
 arch/x86/boot/genimage.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/arch/x86/boot/genimage.sh b/arch/x86/boot/genimage.sh
index 628e936..49f4970 100644
--- a/arch/x86/boot/genimage.sh
+++ b/arch/x86/boot/genimage.sh
@@ -19,6 +19,13 @@
 #   $6 - inird image file
 #
 
+# Use "make V=1" to debug this script
+case "${KBUILD_VERBOSE}" in
+*1*)
+        set -x
+        ;;
+esac
+
 verify () {
 	if [ ! -f "$1" ]; then
 		echo ""                                                   1>&2
@@ -50,7 +57,7 @@ genbzdisk() {
 }
 
 genfdimage144() {
-	dd if=/dev/zero of=$FIMAGE bs=1024 count=1440
+	dd if=/dev/zero of=$FIMAGE bs=1024 count=1440 2> /dev/null
 	mformat v:
 	syslinux $FIMAGE
 	echo "$KCMDLINE" | mcopy - v:syslinux.cfg
@@ -61,7 +68,7 @@ genfdimage144() {
 }
 
 genfdimage288() {
-	dd if=/dev/zero of=$FIMAGE bs=1024 count=2880
+	dd if=/dev/zero of=$FIMAGE bs=1024 count=2880 2> /dev/null
 	mformat w:
 	syslinux $FIMAGE
 	echo "$KCMDLINE" | mcopy - W:syslinux.cfg
@@ -79,14 +86,12 @@ genisoimage() {
 		for j in syslinux ISOLINUX ; do
 			if [ -f /usr/$i/$j/isolinux.bin ] ; then
 				isolinux=/usr/$i/$j/isolinux.bin
-				echo "Using $isolinux"
 				cp $isolinux $tmp_dir
 			fi
 		done
 		for j in syslinux syslinux/modules/bios ; do
 			if [ -f /usr/$i/$j/ldlinux.c32 ]; then
 				ldlinux=/usr/$i/$j/ldlinux.c32
-				echo "Using $ldlinux"
 				cp $ldlinux $tmp_dir
 			fi
 		done
@@ -103,7 +108,7 @@ genisoimage() {
 	if [ -f "$FDINITRD" ] ; then
 		cp "$FDINITRD" $tmp_dir/initrd.img
 	fi
-	mkisofs -J -r -input-charset=utf-8 -o $FIMAGE -b isolinux.bin \
+	mkisofs -J -r -input-charset=utf-8 -quiet -o $FIMAGE -b isolinux.bin \
 		-c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
 		$tmp_dir
 	isohybrid $FIMAGE 2>/dev/null || true
-- 
2.7.4

Powered by blists - more mailing lists