Changeset f3ecd07 for npl/fileserver/samba_conf

Timestamp:

06/22/17 08:39:54 (8 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master, perl-5.22

Children:

5160d62

Parents:

21d4867 (diff), 6782bd4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'gcc484'

Location:

npl/fileserver/samba_conf

Files:

• root/etc/postinst.d/post.samba (modified) (1 diff)
• samba_conf.SlackBuild.log.gz (modified) (previous)
• samba_conf.build (modified) (1 diff)
• samba_conf.md5 (modified) (2 diffs)
• samba_conf.pkg (modified) (previous)

npl/fileserver/samba_conf/root/etc/postinst.d/post.samba

@@ -1 +1 @@
 #!/bin/sh
 
-ln -s /home/system/samba /etc/samba 2>/dev/null
-ln -s /home/system/cups /etc/cups 2>/dev/null
+#replace by symlink
+if ! [ -L /etc/cups ]; then
+        ln -s /home/system/cups /etc/cups 2>/dev/null
+fi
+
+if ! [ -L /etc/samba ]; then
+        mv /etc/samba /etc/samba.old
+        ln -s /home/system/samba /etc/samba 2>/dev/null
+fi
 
 

npl/fileserver/samba_conf/samba_conf.build

@@ -1 @@
-6449
+6451

npl/fileserver/samba_conf/samba_conf.md5

@@ -1 @@
-15f46e8c83dce59f12980bef8cc424cf  ./root/etc/postinst.d/post.samba
+784f7ea0934c95d4518fd446b146a083  ./root/etc/postinst.d/post.samba
 c473d0d177dab192550848c30d7cbbcb  ./root/home/shares/netlogon/logon.bat.new
 38d7df09b3968b369c7b43a5cde5856e  ./root/home/system/cups/cupsd.conf.default.new
@@ -16 +16 @@
 a94682b32e8f1f709ed4c22997d5c0a7  ./root/service/smbd/run
 7f4de4630eb70bfe77bd7ccea504230f  ./root/service/winbindd/run
-fb44b6644391b58803cb08d04f902204  ./samba_conf.pkg
+9ed27621e83be249532912c74760d061  ./samba_conf.pkg
 ca70f70bd0e82246686e746c7bf20e21  ./samba_conf.SlackBuild
-909f186b8858664ddb15c01be1fa1a27  ./samba_conf.SlackBuild.log.gz
+f0415c41b574991ade5595f0a7869122  ./samba_conf.SlackBuild.log.gz