diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-02-06 15:45:45 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-02-06 18:07:57 +0000 |
| commit | 3c9ef0e9780443d28a078c49bab80cb13e5608ae (patch) | |
| tree | 165ddb51565b5530e559ecf34497618c762bb331 /appliance | |
| parent | 590d8c3c3732c603cfb1d2180190a02df528e5ed (diff) | |
| download | libguestfs-3c9ef0e9780443d28a078c49bab80cb13e5608ae.tar.gz libguestfs-3c9ef0e9780443d28a078c49bab80cb13e5608ae.tar.xz libguestfs-3c9ef0e9780443d28a078c49bab80cb13e5608ae.zip | |
build: Choose a virtual directory for the daemon which is not a symlink.
Check /sbin, /usr/sbin, /bin and /usr/bin to ensure that neither the
directory nor the parent (eg. /usr) is a symlink, and use this
directory for the virtual directory used to store guestfsd in the
appliance.
Diffstat (limited to 'appliance')
| -rw-r--r-- | appliance/Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/appliance/Makefile.am b/appliance/Makefile.am index 99896be3..09a5d00d 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -67,10 +67,11 @@ stamp-supermin: make.sh packagelist excludelist supermin.d/daemon.img: ../daemon/guestfsd mkdir -p supermin.d rm -f $@ $@-t - mkdir sbin - cd sbin && ln ../../daemon/guestfsd - echo -e "sbin\nsbin/guestfsd" | cpio --quiet -o -H newc > $@-t - rm -r sbin + rm -rf tmp + mkdir -p tmp$(DAEMON_SUPERMIN_DIR) + ln ../daemon/guestfsd tmp$(DAEMON_SUPERMIN_DIR)/guestfsd + ( cd tmp && find | cpio --quiet -o -H newc ) > $@-t + rm -rf tmp mv $@-t $@ supermin.d/init.img: init |