diff --git a/ChangeLog b/ChangeLog index 54ba1ddc..9650e12a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24911,3 +24911,6 @@ * Added an rdautorest(8) man page. 2024-10-09 Fred Gleason * Fixed typos in rdautorest(8). +2024-10-09 Fred Gleason + * Added code to rdautorest(8) to remove sandbox header from database + backups. diff --git a/utils/rdautorest/rdautorest.py b/utils/rdautorest/rdautorest.py index bc05bf49..8acf8628 100755 --- a/utils/rdautorest/rdautorest.py +++ b/utils/rdautorest/rdautorest.py @@ -87,9 +87,6 @@ if(os.waitstatus_to_exitcode(result)!=0): # Stop Rivendell service # result=os.system(command='/bin/systemctl stop rivendell') -#if(os.waitstatus_to_exitcode(result)!=0): -# syslog.syslog(syslog.LOG_ERR,'unable to stop Rivendell service') -# exit(1) # # Create new database @@ -102,7 +99,7 @@ sql='create\ database\ '+rd_config.get('mySQL','Database')+'\;' cmd='echo '+sql+' | mysql -h '+rd_config.get('mySQL','Hostname')+' -u '+rd_config.get('mySQL','Loginname')+' -p'+rd_config.get('mySQL','Password') os.system(command=cmd) -cmd='gzip -cd '+mountpoint+'/db.sql.gz | mysql -h '+rd_config.get('mySQL','Hostname')+' -u '+rd_config.get('mySQL','Loginname')+' -p'+rd_config.get('mySQL','Password')+' '+rd_config.get('mySQL','Database') +cmd='gzip -cd '+mountpoint+'/db.sql.gz | sed \'1{/999999.*sandbox/d}\' | mysql -h '+rd_config.get('mySQL','Hostname')+' -u '+rd_config.get('mySQL','Loginname')+' -p'+rd_config.get('mySQL','Password')+' '+rd_config.get('mySQL','Database') os.system(command=cmd) # @@ -115,9 +112,6 @@ os.system(command=cmd) # Start Rivendell service # result=os.system(command='/bin/systemctl restart rivendell') -#if(os.waitstatus_to_exitcode(result)!=0): -# syslog.syslog(syslog.LOG_ERR,'unable to start Rivendell service') -# exit(1) # # Unmount backup device