diff options
| author | damien <damien@mandriva.com> | 2000-09-28 14:47:50 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2000-09-28 14:47:50 +0000 |
| commit | bf8e10a202230c6be1232eb9126ad8159d7eef1c (patch) | |
| tree | a7d9af47b35c72e665e4eb83c9588a9a36ee83b5 | |
| parent | 19d7f97b4297fefe06b2fd0bfec835369275d945 (diff) | |
| download | drakx-backup-do-not-use-bf8e10a202230c6be1232eb9126ad8159d7eef1c.tar drakx-backup-do-not-use-bf8e10a202230c6be1232eb9126ad8159d7eef1c.tar.gz drakx-backup-do-not-use-bf8e10a202230c6be1232eb9126ad8159d7eef1c.tar.bz2 drakx-backup-do-not-use-bf8e10a202230c6be1232eb9126ad8159d7eef1c.tar.xz drakx-backup-do-not-use-bf8e10a202230c6be1232eb9126ad8159d7eef1c.zip | |
updated
| -rw-r--r-- | perl-install/Makefile | 2 | ||||
| -rw-r--r-- | perl-install/Makefile.drakxtools | 1 | ||||
| -rw-r--r-- | perl-install/network.pm | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index bb27b54f4..682b828f0 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -16,7 +16,7 @@ tar-drakxtools: clean $(MAKE) -C ../tools clean cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/ddcprobe tools/serial_probe drakxtools cd ../drakxtools ; rm -rf install* pkgs.pm ftp.pm t.pm */CVS ; mv Makefile.drakxtools Makefile ; mv -f standalone/* . - cd .. ; tar cfI drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config share/MonitorsDB share/Cards+ share/CardsNames Newt c ddcprobe serial_probe share/po pci_probing sbus_probing resize_fat share/diskdrake.rc share/draknet.rc share/isdndb.net share/adsldb.net $(STANDALONEPMS) icons *.pm) + cd .. ; tar cfI drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config share/MonitorsDB share/Cards+ share/CardsNames Newt c ddcprobe serial_probe share/po pci_probing sbus_probing resize_fat share/diskdrake.rc share/isdndb.net share/adsldb.net $(STANDALONEPMS) icons *.pm) cd .. ; rm -rf drakxtools $(DIRS): diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools index 0ebefd613..8b7bcf8eb 100644 --- a/perl-install/Makefile.drakxtools +++ b/perl-install/Makefile.drakxtools @@ -31,7 +31,6 @@ install: for i in *.pm ; do perl -pe '$$_ = "\n" if /\s*use\s+(diagnostics|vars|strict)/' $$i > $(LIBDEST)/$$i ; done install -m 644 share/isdndb.net $(DATADIR)/isdn_db.txt install -m 644 share/adsldb.net $(DATADIR)/adsl_db.txt - install -m 644 share/draknet.rc $(ETCDEST)/draknet.rc install -m 644 share/{MonitorsDB,CardsNames,Cards+} $(LIBX11DEST) install -m 644 share/diskdrake.rc $(ETCDEST) install -m 644 share/po/*.po $(LIBDEST)/po diff --git a/perl-install/network.pm b/perl-install/network.pm index 75d29537f..62aa592c5 100644 --- a/perl-install/network.pm +++ b/perl-install/network.pm @@ -101,7 +101,7 @@ sub write_resolv_conf { print F "search $netc->{DOMAINNAME} $netc->{DOMAINNAME2}\n\n" if ($netc->{DOMAINNAME} || $netc->{DOMAINNAME2}); print F "# nameserver $_\n" foreach grep { ! exists $used_dns{$_} } sort { $dns{$a} <=> $dns{$b} } keys %dns; print F "nameserver $_\n" foreach sort { $used_dns{$a} <=> $used_dns{$b} } grep { $_ } keys %used_dns; - $dns_auto and print F "# ppp temp entry\n"; + $dns_auto or print F "# ppp temp entry\n"; print F "\n"; print F "# $_\n" foreach @unknown; |