commit:     cf40f8d5d5bc9bf46e2b87e9545e3e24523f4ead
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 14 00:47:38 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 14 00:47:38 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=cf40f8d5

Detect mknod failure.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 gen_initramfs.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 070dffc..d5ee5f6 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -89,12 +89,13 @@ append_base_layout() {
        echo "proc          /proc       proc    defaults    0 0" >> 
${TEMP}/initramfs-base-temp/etc/fstab
 
        cd ${TEMP}/initramfs-base-temp/dev
-       mknod -m 660 console c 5 1
-       mknod -m 660 null c 1 3
-       mknod -m 660 zero c 1 5
-       mknod -m 600 tty0 c 4 0
-       mknod -m 600 tty1 c 4 1
-       mknod -m 600 ttyS0 c 4 64
+       # TODO: this will fail as non-root
+       mknod -m 660 console c 5 1 || gen_die "failed to mknod"
+       mknod -m 660 null c 1 3 || gen_die "failed to mknod"
+       mknod -m 660 zero c 1 5 || gen_die "failed to mknod"
+       mknod -m 600 tty0 c 4 0 || gen_die "failed to mknod"
+       mknod -m 600 tty1 c 4 1 || gen_die "failed to mknod"
+       mknod -m 600 ttyS0 c 4 64 || gen_die "failed to mknod"
 
        date -u '+%Y%m%d-%H%M%S' > ${TEMP}/initramfs-base-temp/etc/build_date
        echo "Genkernel $GK_V" > ${TEMP}/initramfs-base-temp/etc/build_id

Reply via email to