summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2005-08-03 08:33:00 +0000
committerFlorent Villard <warly@mandriva.com>2005-08-03 08:33:00 +0000
commita3dc20ca1e54ff7e91210b7089f638e916a1ee3e (patch)
treec3a9eaa951e091dea1ba2b5db7288a7ba232b921
parent0db35d38c56dcad87103e291057656d0c7769df2 (diff)
downloaddrakx-backup-do-not-use-a3dc20ca1e54ff7e91210b7089f638e916a1ee3e.tar
drakx-backup-do-not-use-a3dc20ca1e54ff7e91210b7089f638e916a1ee3e.tar.gz
drakx-backup-do-not-use-a3dc20ca1e54ff7e91210b7089f638e916a1ee3e.tar.bz2
drakx-backup-do-not-use-a3dc20ca1e54ff7e91210b7089f638e916a1ee3e.tar.xz
drakx-backup-do-not-use-a3dc20ca1e54ff7e91210b7089f638e916a1ee3e.zip
revert changes
-rw-r--r--Makefile2
-rw-r--r--perl-install/authentication.pm2
2 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ba4ad1c5f..52fd53bd2 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ upload:
$(MAKE) upload_only
upload_only:
- function upload() { rel=`echo $$1 | sed 's!$(ROOTDEST)/!!'`; rsync -qSavz --verbose --exclude '*~' -e ssh --delete $$1/$$2 mandrake@ken:/c/x86_64/$$rel; } ;\
+ function upload() { rel=`echo $$1 | sed 's!$(ROOTDEST)/!!'`; rsync -qSavz --verbose --exclude '*~' -e ssh --delete $$1/$$2 mandrake@ken:/c/cooker/$$rel; } ;\
upload $(MEDIA_INFO_DEST) 'compssUsers.pl*' ;\
upload $(MEDIA_INFO_DEST) rpmsrate ;\
upload $(STAGE2_DEST) '*.clp' ;\
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index ae3879824..1affd1a9c 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -358,8 +358,6 @@ sub set {
$when_network_is_up->(sub {
run_program::rooted($::prefix, 'net', 'ads', 'join', '-U', $authentication->{winuser} . '%' . $authentication->{winpass});
});
- } elsif ($kind eq 'smartcard') {
-
}
}