Mercurial > hg > aboriginal
diff simple-root-filesystem.sh @ 1727:45c936d93711 draft
Drop ROOT_NODIRS, it's not worth the complexity to support both layouts.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sun, 11 Jan 2015 12:01:30 -0600 |
parents | b871f0e7b837 |
children |
line wrap: on
line diff
--- a/simple-root-filesystem.sh Sun Jan 25 11:53:31 2015 -0600 +++ b/simple-root-filesystem.sh Sun Jan 11 12:01:30 2015 -0600 @@ -13,26 +13,20 @@ # Determine which directory layout we're using -if [ -z "$ROOT_NODIRS" ] -then - mkdir -p "$STAGE_DIR"/{tmp,proc,sys,dev,home,mnt,root} && - chmod a+rwxt "$STAGE_DIR/tmp" || dienow +mkdir -p "$STAGE_DIR"/{tmp,proc,sys,dev,home,mnt,root} && +chmod a+rwxt "$STAGE_DIR/tmp" || dienow - STAGE_USR="$STAGE_DIR/usr" +STAGE_USR="$STAGE_DIR/usr" - # Having lots of repeated locations at / and also under /usr is silly, so - # symlink them together. (The duplication happened back in the 1970's - # when Ken and Dennis ran out of space on their PDP-11's root disk and - # leaked the OS into the disk containing the user home directories. It's - # been mindlessly duplicated ever since.) - for i in bin sbin lib etc - do - mkdir -p "$STAGE_USR/$i" && ln -s "usr/$i" "$STAGE_DIR/$i" || dienow - done - -else - STAGE_USR="$STAGE_DIR" && mkdir -p "$STAGE_DIR/bin" || dienow -fi +# Having lots of repeated locations at / and also under /usr is silly, so +# symlink them together. (The duplication happened back in the 1970's +# when Ken and Dennis ran out of space on their PDP-11's root disk and +# leaked the OS into the disk containing the user home directories. It's +# been mindlessly duplicated ever since.) +for i in bin sbin lib etc +do + mkdir -p "$STAGE_USR/$i" && ln -s "usr/$i" "$STAGE_DIR/$i" || dienow +done # Copy qemu setup script and so on.