diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-04-14 18:12:13 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-04-14 18:12:13 +0000 |
| commit | c6d905a2b14952df4fabf0a8565dd6c45b1adc4b (patch) | |
| tree | b5f00a54a274c22edee46811b0c2f1a9540b665a | |
| parent | 37b9283ab83fc1a421499224f6f1d08ceaf6fc2d (diff) | |
| download | ptxdist-c6d905a2b14952df4fabf0a8565dd6c45b1adc4b.tar.gz ptxdist-c6d905a2b14952df4fabf0a8565dd6c45b1adc4b.tar.xz | |
* post/fix-permissions.make, post/mk-devnodes.make, fix-permissions.in, mk-devnodes.in, convenience.in:
renamed mk-devnodes -> fix-permissions
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7993 33e552b5-05e3-0310-8538-816dae2090ed
| -rw-r--r-- | rules/convenience.in | 2 | ||||
| -rw-r--r-- | rules/fix-permissions.in (renamed from rules/mk-devnodes.in) | 4 | ||||
| -rw-r--r-- | rules/post/fix-permissions.make | 39 | ||||
| -rw-r--r-- | rules/post/mk-devnodes.make | 44 |
4 files changed, 42 insertions, 47 deletions
diff --git a/rules/convenience.in b/rules/convenience.in index 87eb2fd5d..0d73c337a 100644 --- a/rules/convenience.in +++ b/rules/convenience.in @@ -1,4 +1,4 @@ # Meta Config File # Workplace Convenience -source "rules/mk-devnodes.in" +source "rules/fix-permissions.in" diff --git a/rules/mk-devnodes.in b/rules/fix-permissions.in index fd22e5466..34680c271 100644 --- a/rules/mk-devnodes.in +++ b/rules/fix-permissions.in @@ -1,5 +1,5 @@ -config MKDEVNODES - bool "create primary rootfs devnodes for nfs" +config FIX_PERMISSIONS + bool "create primary rootfs devnodes for nfs and fix permissions" default n help This function is useful for development diff --git a/rules/post/fix-permissions.make b/rules/post/fix-permissions.make new file mode 100644 index 000000000..8dcf17f90 --- /dev/null +++ b/rules/post/fix-permissions.make @@ -0,0 +1,39 @@ +# -*-makefile-*- + +### --- internal --- + +PTX_FIXPERM_RUN := $(STATEDIR)/fix-permissions.run + +ifdef PTXCONF_FIX_PERMISSIONS +world: $(PTX_FIXPERM_RUN) +endif + +$(PTX_FIXPERM_RUN): $(PTX_PERMISSIONS) $(STATEDIR)/world.targetinstall + @echo; \ + echo; \ + echo; \ + echo; \ + echo; \ + echo; \ + echo "creating devnodes, for the smooth nfsroot feeling"; \ + echo; \ + echo; \ + echo; \ + echo; \ + echo; \ + echo; \ + read -t 30 -p "(press enter to let sudo to that job)"; \ + if test $$? -eq 0; then \ + for dir in "$(ROOTDIR)" "$(ROOTDIR_DEBUG)"; do \ + sudo $(SCRIPTSDIR)/fix-permissions.sh -r "$${dir}" -p "$<"; \ + $(CHECK_PIPE_STATUS) \ + done; \ + $(call touch, $@) \ + else \ + echo; \ + echo "watch out for missing initial consoles..."; \ + echo; \ + fi + + +# vim: syntax=make diff --git a/rules/post/mk-devnodes.make b/rules/post/mk-devnodes.make deleted file mode 100644 index a6b7c5108..000000000 --- a/rules/post/mk-devnodes.make +++ /dev/null @@ -1,44 +0,0 @@ -# -*-makefile-*- - -PTX_FIXPERM_SCRIPT := $(STATEDIR)/ptxdist-fixperm.sh -PTX_FIXPERM_RUN := $(STATEDIR)/ptxdist-fixperm.done - -ifdef PTXCONF_MKDEVNODES -world: $(PTX_FIXPERM_RUN) -endif - -$(PTX_FIXPERM_RUN): $(PTX_FIXPERM_SCRIPT) - @echo; \ - echo "creating devnodes, for the smooth nfsroot feeling"; \ - echo; \ - read -t 5 -p "(press enter to let sudo to that job)"; \ - if test $$? -eq 0; then \ - for dir in "$(ROOTDIR)" "$(ROOTDIR_DEBUG)"; do \ - pushd "$$dir" > /dev/null; \ - sudo /bin/bash -x "$<"; \ - popd > /dev/null; \ - done; \ - else \ - echo; \ - echo "watch out for missing initial consoles..."; \ - echo; \ - fi - - -$(PTX_FIXPERM_SCRIPT): world_packages - @echo "#/bin/bash" > "$@" - @chmod +x "$@" - - @IFS=":"; \ - ( \ - egrep "^n:" -h $(STATEDIR)/*.perms | \ - while read n node uid gid perm type major minor; do \ - node="$${node#/}"; \ - echo "if test -e $$node; then rm -rf $$node; fi"; \ - echo "mknod $$node $$type $$major $$minor"; \ - echo "chown $$uid:$$gid $$node"; \ - echo "chmod $$perm $$node"; \ - done; \ - ) >> "$@" - -# vim: syntax=make |