Changeset c403a2d

Timestamp:

11/21/17 19:05:19 (7 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master, perl-5.22

Children:

9d05a18

Parents:

749056a (diff), 1f5b330 (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) (2 diffs)
• 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

@@ -3 +3 @@
 #replace by symlink
 if ! [ -L /etc/cups ]; then
+        mv /etc/cups /etc/cups.old 2>/dev/null
         ln -s /home/system/cups /etc/cups 2>/dev/null
 fi
 
 if ! [ -L /etc/samba ]; then
-        mv /etc/samba /etc/samba.old
+        mv /etc/samba /etc/samba.old 2>/dev/null
         ln -s /home/system/samba /etc/samba 2>/dev/null
 fi
@@ -20 +21 @@
 fi
 
-if ! cat /home/system/samba/smb.conf | grep "store dos attributes" &> /dev/null; then 
+if ! cat /home/system/samba/smb.conf | grep "store dos attributes" &> /dev/null; then
         sed -i /home/system/samba/smb.conf \
         -e "s/    unix extensions = no/    unix extensions = no\n    store dos attributes = yes/"

npl/fileserver/samba_conf/samba_conf.build

@@ -1 @@
-6451
+6452

npl/fileserver/samba_conf/samba_conf.md5

@@ -1 @@
-784f7ea0934c95d4518fd446b146a083  ./root/etc/postinst.d/post.samba
+fbc2460f5067c21a9e1271151d76406f  ./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
-9ed27621e83be249532912c74760d061  ./samba_conf.pkg
+6ce96a0ec5bd4c6af6c30bdb3ffbcebe  ./samba_conf.pkg
 ca70f70bd0e82246686e746c7bf20e21  ./samba_conf.SlackBuild
-f0415c41b574991ade5595f0a7869122  ./samba_conf.SlackBuild.log.gz
+532c2fda6e086cbf8df8d7c52370cae0  ./samba_conf.SlackBuild.log.gz