]>
Commit | Line | Data |
---|---|---|
cfed313b SP |
1 | diff -urN BUILD/orginal/configure.pl BUILD/BackupPC-2.1.0/configure.pl |
2 | --- BackupPC-2.1.0/configure.pl 2004-06-20 04:28:08.000000000 +0200 | |
3 | +++ BackupPC-2.1.0/configure.pl 2004-11-27 23:29:05.343933152 +0100 | |
4 | @@ -1,4 +1,4 @@ | |
5 | -#!/bin/perl | |
6 | +#!/usr/bin/perl | |
7 | #============================================================= -*-perl-*- | |
8 | # | |
9 | # configure.pl: Configuration and installation program for BackupPC | |
10 | @@ -248,20 +248,18 @@ | |
11 | ||
12 | EOF | |
13 | my($name, $passwd, $Uid, $Gid); | |
14 | -while ( 1 ) { | |
15 | - $Conf{BackupPCUser} = prompt("--> BackupPC should run as user", | |
16 | - $Conf{BackupPCUser} || "backuppc", | |
17 | - "username"); | |
18 | - ($name, $passwd, $Uid, $Gid) = getpwnam($Conf{BackupPCUser}); | |
19 | - last if ( $name ne "" ); | |
20 | +#while ( 1 ) { | |
21 | + $Conf{BackupPCUser} = "backuppc"; | |
22 | + $name = "backuppc"; $passwd = ""; $Uid = "150"; $Gid = "150"; | |
23 | + # last if ( $name ne "" ); | |
24 | print <<EOF; | |
25 | ||
26 | getpwnam() says that user $Conf{BackupPCUser} doesn't exist. Please check the | |
27 | name and verify that this user is in the passwd file. | |
28 | ||
29 | EOF | |
30 | - exit(1) if ( $opts{batch} ); | |
31 | -} | |
32 | +# exit(1) if ( $opts{batch} ); | |
33 | +#} | |
34 | ||
35 | print <<EOF; | |
36 | ||
37 | @@ -451,7 +449,7 @@ | |
38 | mkpath("$DestDir$Conf{InstallDir}/$dir", 0, 0775); | |
39 | if ( !-d "$DestDir$Conf{InstallDir}/$dir" | |
40 | || !chown($Uid, $Gid, "$DestDir$Conf{InstallDir}/$dir") ) { | |
41 | - die("Failed to create or chown $DestDir$Conf{InstallDir}/$dir\n"); | |
42 | +# die("Failed to create or chown $DestDir$Conf{InstallDir}/$dir\n"); | |
43 | } else { | |
44 | print("Created $DestDir$Conf{InstallDir}/$dir\n"); | |
45 | } | |
46 | @@ -464,7 +462,7 @@ | |
47 | next if ( $dir eq "" || -d $dir ); | |
48 | mkpath("$DestDir$dir", 0, 0775); | |
49 | if ( !-d "$DestDir$dir" || !chown($Uid, $Gid, "$DestDir$dir") ) { | |
50 | - die("Failed to create or chown $DestDir$dir"); | |
51 | +# die("Failed to create or chown $DestDir$dir"); | |
52 | } else { | |
53 | print("Created $DestDir$dir\n"); | |
54 | } | |
55 | @@ -477,7 +475,7 @@ | |
56 | mkpath("$DestDir$Conf{TopDir}/$dir", 0, 0750) if ( !-d "$DestDir$Conf{TopDir}/$dir" ); | |
57 | if ( !-d "$DestDir$Conf{TopDir}/$dir" | |
58 | || !chown($Uid, $Gid, "$DestDir$Conf{TopDir}/$dir") ) { | |
59 | - die("Failed to create or chown $DestDir$Conf{TopDir}/$dir\n"); | |
60 | +# die("Failed to create or chown $DestDir$Conf{TopDir}/$dir\n"); | |
61 | } else { | |
62 | print("Created $DestDir$Conf{TopDir}/$dir\n"); | |
63 | } | |
64 | @@ -700,8 +698,8 @@ | |
65 | my $uid = $stat[4]; | |
66 | my $gid = $stat[5]; | |
67 | die("can't copy($dest, $confCopy)\n") unless copy($dest, $confCopy); | |
68 | - die("can't chown $uid, $gid $confCopy\n") | |
69 | - unless chown($uid, $gid, $confCopy); | |
70 | +# die("can't chown $uid, $gid $confCopy\n") | |
71 | +# unless chown($uid, $gid, $confCopy); | |
72 | die("can't chmod $mode $confCopy\n") unless chmod($mode, $confCopy); | |
73 | } | |
74 | open(OUT, ">", $dest) || die("can't open $dest for writing\n"); | |
75 | @@ -724,7 +722,7 @@ | |
76 | close(OUT); | |
77 | if ( !defined($oldConf) ) { | |
78 | die("can't chmod 0640 mode $dest\n") unless chmod(0640, $dest); | |
79 | - die("can't chown $Uid, $Gid $dest\n") unless chown($Uid, $Gid, $dest); | |
80 | +# die("can't chown $Uid, $Gid $dest\n") unless chown($Uid, $Gid, $dest); | |
81 | } | |
82 | ||
83 | if ( $Conf{CgiDir} ne "" ) { | |
84 | @@ -829,7 +827,7 @@ | |
85 | close(PROG); | |
86 | close(OUT); | |
87 | } | |
88 | - die("can't chown $uid, $gid $dest") unless chown($uid, $gid, $dest); | |
89 | +# die("can't chown $uid, $gid $dest") unless chown($uid, $gid, $dest); | |
90 | die("can't chmod $mode $dest") unless chmod($mode, $dest); | |
91 | } | |
92 |