浏览代码

Restart database on restore

Bob Mottram 10 年前
父节点
当前提交
a2b8d95fba
共有 1 个文件被更改,包括 10 次插入8 次删除
  1. 10
    8
      install-freedombone.sh

+ 10
- 8
install-freedombone.sh 查看文件

924
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
924
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
925
       echo '  shred -zu /root/tempmariadb/usb/backup/mariadb/tempmariadb/db' >> /usr/bin/$RESTORE_SCRIPT_NAME
925
       echo '  shred -zu /root/tempmariadb/usb/backup/mariadb/tempmariadb/db' >> /usr/bin/$RESTORE_SCRIPT_NAME
926
       echo '  rm -rf /root/tempmariadb' >> /usr/bin/$RESTORE_SCRIPT_NAME
926
       echo '  rm -rf /root/tempmariadb' >> /usr/bin/$RESTORE_SCRIPT_NAME
927
-      echo '  echo "Apply the new MariaDB user table"' >> /usr/bin/$RESTORE_SCRIPT_NAME
928
-      echo '  mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD "flush privileges;")' >> /usr/bin/$RESTORE_SCRIPT_NAME
929
-      echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
930
-      echo '    echo "$mysqlsuccess"' >> /usr/bin/$RESTORE_SCRIPT_NAME
931
-      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
932
-      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
933
-      echo '    exit 963' >> /usr/bin/$RESTORE_SCRIPT_NAME
934
-      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
927
+      echo '  echo "Restarting database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
928
+      echo '  service mysql restart' >> /usr/bin/$RESTORE_SCRIPT_NAME
929
+      #echo '  echo "Apply the new MariaDB user table"' >> /usr/bin/$RESTORE_SCRIPT_NAME
930
+      #echo '  mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD "flush privileges;")' >> /usr/bin/$RESTORE_SCRIPT_NAME
931
+      #echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
932
+      #echo '    echo "$mysqlsuccess"' >> /usr/bin/$RESTORE_SCRIPT_NAME
933
+      #echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
934
+      #echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
935
+      #echo '    exit 963' >> /usr/bin/$RESTORE_SCRIPT_NAME
936
+      #echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
935
       echo '  echo "Change the MariaDB password to the backup version"' >> /usr/bin/$RESTORE_SCRIPT_NAME
937
       echo '  echo "Change the MariaDB password to the backup version"' >> /usr/bin/$RESTORE_SCRIPT_NAME
936
       echo '  DATABASE_PASSWORD=$BACKUP_MARIADB_PASSWORD' >> /usr/bin/$RESTORE_SCRIPT_NAME
938
       echo '  DATABASE_PASSWORD=$BACKUP_MARIADB_PASSWORD' >> /usr/bin/$RESTORE_SCRIPT_NAME
937
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
939
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME