Changeset 5ae9d94

Timestamp:

May 23, 2012 4:21:14 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

815cd26

Parents:

2303ca1

Message:

Get remote mounting working on linux

Location:

fedkit

Files:

• federate.pl (modified) (2 diffs)
• rc.fedaccounts (modified) (1 diff)

fedkit/federate.pl

@@ -14 +14 @@
 
 use gateway_lib;
+
+# rc.fedaccounts is going to send a TERM to any processes running as an old
+# user, so insulate this (and children) process from propagated signals.
+$SIG{'TERM'} = 'IGNORE';
 
 chdir("/tmp");
@@ -51 +55 @@
 $perl = "perl" unless $perl;
 
-if ($install_smb) {
-    # Install samba
-    system('/usr/bin/yum -y install samba-client');
-    # These tools expect the fstab to include cifs
-    $smb_type = 'cifs';
+if (!-x '/sbin/mount.cifs' ) {
+    if ( -x '/usr/bin/yum' ) {
+        # Install samba
+        system('/usr/bin/yum -y install samba-client');
+        system('/usr/bin/yum -y install cifs-utils');
+        # These tools expect the fstab to include cifs
+        $smb_type = 'cifs';
+    }
+    elsif (-x '/usr/bin/apt-get') {
+        # Install samba
+        system('/usr/bin/apt-get -y install samba-client');
+        system('/usr/bin/apt-get -y install smbfs');
+        # These tools expect the fstab to include cifs
+        $smb_type = 'cifs';
+    }
 }
 

fedkit/rc.fedaccounts

@@ -66 +66 @@
 
 foreach my $u (@delusers) {
+    # Can't delete a user who's logged in.  Log 'em out.
+    system('/usr/bin/pkill', '-u', $u) if (-x '/usr/bin/pkill');
     print "Deleting user $u\n";
     os_userdel($u);