[oe-commits] Roy Li : webmin: make reconfigure webmin be able to work

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: c1c5442ee4c0100e8b368ed58efb13c796c5dc05
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c1c5442ee4c0100e8b368ed58efb13c796c5dc05

Author: Roy Li <rongqing.li at windriver.com>
Date:   Tue Jul 22 16:25:35 2014 +0800

webmin: make reconfigure webmin be able to work

when move a file, test if this file exist or not

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
index 0f8781f..91ec5d7 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
@@ -36,12 +36,12 @@ do_configure() {
     rm -rf stunnel squid sarg pptp-client pptp-server jabber openslp sentry cluster-* vgetty burner heartbeat
 
     # Adjust configs
-    mv init/config-debian-linux init/config-generic-linux
+    [ -f init/config-debian-linux ] && mv init/config-debian-linux init/config-generic-linux
     sed -i "s/shutdown_command=.*/shutdown_command=poweroff/" init/config-generic-linux
     echo "exclude=bootmisc.sh,single,halt,reboot,hostname.sh,modutils.sh,mountall.sh,mountnfs.sh,networking,populate-volatile.sh,rmnologin.sh,save-rtc.sh,umountfs,umountnfs.sh,hwclock.sh,checkroot.sh,banner.sh,udev,udev-cache,devpts.sh,psplash.sh,sendsigs,fbsetup,bootlogd,stop-bootlogd,sysfs.sh,syslog,syslog.busybox,urandom,webmin,functions.initscripts,read-only-rootfs-hook.sh" >> init/config-generic-linux
     echo "excludefs=devpts,devtmpfs,usbdevfs,proc,tmpfs,sysfs,debugfs" >> mount/config-generic-linux
 
-    mv exports/config-debian-linux exports/config-generic-linux
+    [ -f exports/config-debian-linux ] && mv exports/config-debian-linux exports/config-generic-linux
     sed -i "s/killall -HUP rpc.nfsd && //" exports/config-generic-linux
     sed -i "s/netstd_nfs/nfsserver/g" exports/config-generic-linux