no_comment

6 files changed, 32 insertions, 6 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index 8155ce1fc..cd103b0c2 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -161,6 +161,6 @@ stage2:
 
 # function f() { grep "$*" /usr/include/*.h /usr/include/*/*.h; }
 
-# dd if=/dev/zero of=/tmp/initrd bs=1k count=2000 ; echo y | mke2fs /tmp/initrd ; mount /tmp/initrd /mnt/disk/ -o loop ; cd ~pixel/gi/perl-install ; install -s install/install install1/bin/install ; cp -a install1/* /mnt/disk/ ; umount /mnt/disk ; gzip -c /tmp/initrd > /tmp/initrd.img ; mcopy -o /tmp/initrd.img a:
+# dd if=/dev/zero of=/tmp/initrd bs=1k count=2000 ; echo y | mke2fs /tmp/initrd ; mount /tmp/initrd /mnt/disk/ -o loop ; cd ~pixel/gi/perl-install ; install -s install/install install1/bin/install ; install -s installinit/init install1/bin/ ; cp -a install1/* /mnt/disk/ ; umount /mnt/disk ; gzip -c /tmp/initrd > /tmp/initrd.img ; mcopy -o /tmp/initrd.img a:
 # mount /tmp/initrd /mnt/disk/ -o loop ;  ; umount /mnt/disk ; gzip -c /tmp/initrd > /tmp/initrd.img ; mcopy -o /tmp/initrd.img a:
 
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index cab2718db..d951ec570 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -208,7 +208,7 @@ sub configureServices { $o->servicesConfig }
 sub setRootPassword { $o->setRootPassword }
 sub addUser { 
     $o->addUser;
-    run_program::rooted($o->{prefix}, "pwconv"); # use shadow passwords
+    run_program::rooted($o->{prefix}, "pwconv") or log::l("pwconv failed"); # use shadow passwords
 }
 
 sub createBootdisk {
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index d299b8bfc..1233b6e9e 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -92,7 +92,9 @@ sub mouse_detect() {
 
 sub shells($) {
     my ($o) = @_;
-    grep { -x "$o->{prefix}$_" } @{$o->{default}->{shells}};
+    my @l = grep { -x "$o->{prefix}$_" } @{$o->{default}->{shells}};
+    @l or die "no shell available";
+    @l;
 }
 
 sub upgrFindInstall {
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d1436523e..106d56c96 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -33,7 +33,7 @@ use lang;
 use log;
 
 1;
-=cut
+
 
 sub errorInStep($$) {
     my ($o, $err) = @_;
@@ -115,4 +115,3 @@ consult the Errata available from http://www.linux-mandrake.com/.
 Information on configuring your system is available in the post
 install chapter of the Official Linux Mandrake User's Guide."));
 }
-=cut
diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm
index 2973a57cc..54887f882 100644
--- a/perl-install/run_program.pm
+++ b/perl-install/run_program.pm
@@ -25,6 +25,9 @@ sub rooted($$@) {
 	$root and chroot $root;
 	chdir "/";
 
-	exec $name, @args or log::l("exec of $name failed: $!"), exec('false') || exit(1);
+	unless (exec $name, @args) {
+	    log::l("exec of $name failed: $!");
+	    exec('false') or exit(1);
+	}
     }
 }
diff --git a/perl-install/share/install.rc b/perl-install/share/install.rc
new file mode 100644
index 000000000..aa893579d
--- /dev/null
+++ b/perl-install/share/install.rc
@@ -0,0 +1,22 @@
+
+
+style "border"
+{
+  bg[NORMAL] = { 0, 0, 0 }
+}
+
+style "steps"
+{
+  bg[NORMAL] = { 0, 0, 0 }
+  fg[NORMAL] = { 1.0, 1.0, 1.0 }
+}
+
+style "title"
+{
+  bg[NORMAL] = { 0, 0.66, 1.0 }
+#  fg[NORMAL] = { 1.0, 1.0, 1.0 }
+}
+
+
+widget "*Title" style "title"
+widget "*Steps" style "steps"