- move convert script from spec file into standalone/convert

- btw, do not try converting if uneeded

4 files changed, 13 insertions, 3 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index 3068f4d6c..2a228826d 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -8,7 +8,7 @@ include Makefile.config
 
 POFILES   = $(shell ls share/po/*.po)
 MOFILES   = $(POFILES:%.po=%.mo)
-DISTFILES = *.pm $(PMS_DIRS) Makefile Makefile.config ddcprobe drakxtools.spec serial_probe share/po share/diskdrake.rc $(STANDALONEPMS) standalone/icons standalone/man/C/* pixmaps pixmaps/langs standalone/interactive_http rpcinfo-flushed.c standalone/service_harddrake.sh standalone/finish-install.xsetup
+DISTFILES = *.pm $(PMS_DIRS) Makefile Makefile.config ddcprobe drakxtools.spec serial_probe share/po share/diskdrake.rc $(STANDALONEPMS) standalone/icons standalone/man/C/* pixmaps pixmaps/langs standalone/interactive_http rpcinfo-flushed.c standalone/convert standalone/finish-install.xsetup standalone/service_harddrake.sh
 OTHERS     = $(OTHERDIRS) $(OTHERFILES)
 OTHERDIRS  = tools/ddcprobe tools/serial_probe
 OTHERFILES = tools/rpcinfo-flushed.c
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 623ae8cdd..ec1383ba0 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -30,7 +30,7 @@ $(DIRS):
 install:
 	mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{harddrake,pixmaps,icons/{large,mini},autostart} $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(INITDIR) $(MENUDIR)
 	install -d $(INLIBDEST_DIRS:%=$(LIBDEST)/%)
-	install $(STANDALONEPMS) standalone/service_harddrake.sh $(SBINDEST)
+	install $(STANDALONEPMS) standalone/service_harddrake.sh standalone/convert $(SBINDEST)
 	install -s rpcinfo-flushed ddcprobe/ddcxinfos serial_probe/serial_probe $(SBINDEST)
 	ln -s ../../$(patsubst $(PREFIX)/usr%,%,$(SBINDEST))/XFdrake $(BINX11DEST)/Xdrakres
 	ln -s fileshareset $(SBINDEST)/filesharelist
@@ -67,6 +67,7 @@ install:
 	rmdir $(LIBDEST)/icons/harddrake2/menu
 	mv $(LIBDEST)/icons/harddrake2/ $(DATADIR)/pixmaps/
 	mv $(SBINDEST)/service_harddrake.sh $(INITDIR)/harddrake
+	mv $(SBINDEST)/convert $(DATADIR)/harddrake
 	mv $(SBINDEST)/service_harddrake $(DATADIR)/harddrake/
 	ln -s {XFdrake,$(SBINDEST)/drakx11}
 	ln -s {diskdrake,$(SBINDEST)/drakdisk}
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index c1ff69a72..b81d311e5 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -252,7 +252,6 @@ case \$DESKTOP in
 esac
 EOF
 
-mv $RPM_BUILD_ROOT%_sbindir/convert $RPM_BUILD_ROOT%_datadir/harddrake/
 mv $RPM_BUILD_ROOT%_sbindir/service_harddrake_confirm $RPM_BUILD_ROOT%_datadir/harddrake/confirm
 
 chmod +x $RPM_BUILD_ROOT{%_datadir/harddrake/*,%_sysconfdir/X11/xinit.d/{harddrake2,net_applet}}
diff --git a/perl-install/standalone/convert b/perl-install/standalone/convert
new file mode 100644
index 000000000..f86039297
--- /dev/null
+++ b/perl-install/standalone/convert
@@ -0,0 +1,10 @@
+#!/usr/bin/perl
+use Storable;
+use MDK::Common::File qw(cat_);
+ 
+my $last_boot_config = "/etc/sysconfig/harddrake2/previous_hw";
+ 
+if (cat_($last_boot_config) !~ /^pst0/) {
+    my $config = do $last_boot_config;
+    store($config, $last_boot_config);
+}