diff -Nur --no-dereference smeserver-smeadmin-1.6.old/createlinks smeserver-smeadmin-1.6/createlinks --- smeserver-smeadmin-1.6.old/createlinks 2020-10-15 07:31:28.000000000 -0400 +++ smeserver-smeadmin-1.6/createlinks 2021-03-25 01:33:42.522000000 -0400 @@ -22,10 +22,11 @@ #Creation of the event smeadmin-update for my $event (qw( smeadmin-update + smeserver-smeadmin-update )) { - safe_symlink("start", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/smeadmind"); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/lm_sensors"); } diff -Nur --no-dereference smeserver-smeadmin-1.6.old/root/etc/e-smith/db/configuration/migrate/smeadmin smeserver-smeadmin-1.6/root/etc/e-smith/db/configuration/migrate/smeadmin --- smeserver-smeadmin-1.6.old/root/etc/e-smith/db/configuration/migrate/smeadmin 2020-10-15 07:31:28.000000000 -0400 +++ smeserver-smeadmin-1.6/root/etc/e-smith/db/configuration/migrate/smeadmin 2021-03-25 01:29:34.607000000 -0400 @@ -20,6 +20,15 @@ warn "Could not open /dev/urandom: $!"; } + # let's migrate sme9admind values to smeadmind + if ( defined $sme9admind && ! defined $smeadmind ) { + for my $propertie (keys %sme9admind) { + next if $propertie eq "DbName" || $propertie eq "DbUser"; + $smeadmindb->set_prop($propertie, $sme9admind{$propertie}); + } + + } + $smeadmindb->set_prop('DbPassword', $pw) if not $smeadmindb->prop('DbPassword'); if ( -e "/etc/e-smith/web/panels/manager/html/smeadmin/_smeadmin.conf" ){ diff -Nur --no-dereference smeserver-smeadmin-1.6.old/root/etc/e-smith/sql/init/smeadmin smeserver-smeadmin-1.6/root/etc/e-smith/sql/init/smeadmin --- smeserver-smeadmin-1.6.old/root/etc/e-smith/sql/init/smeadmin 2020-10-15 07:31:28.000000000 -0400 +++ smeserver-smeadmin-1.6/root/etc/e-smith/sql/init/smeadmin 2021-03-25 01:31:40.870000000 -0400 @@ -1,7 +1,7 @@ #!/bin/bash # mysql -if [ -d /var/lib/mysql/sme8admin ] && [ ! -d /var/lib/mysql/smeadmin ]; then +if [ -d /var/lib/mysql/sme9admin ] && [ ! -d /var/lib/mysql/smeadmin ]; then echo "Migrating existing sme8admin MySQL database." mysqladmin create smeadmin mysqldump sme8admin | mysql smeadmin @@ -17,10 +17,10 @@ fi # rrd - # migrating previous sme8admin rrd - if [ -d /var/lib/sme8admin ] && [ ! -d /var/lib/smeadmin ]; then - echo "Migrating existing sme8admin RRDs files." - cp -vr /var/lib/sme8admin /var/lib/smeadmin + # migrating previous sme9admin rrd + if [ -d /var/lib/sme9admin ] && [ ! -d /var/lib/smeadmin ]; then + echo "Migrating existing sme9admin RRDs files." + cp -vr /var/lib/sme9admin /var/lib/smeadmin fi #ADD more DS for version 1.5-10