422 |
$OUT .= "}\n"; |
$OUT .= "}\n"; |
423 |
- |
- |
424 |
+ |
+ |
425 |
} |
diff -urN smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/db/configuration/migrate/phpvirtualbox smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/db/configuration/migrate/phpvirtualbox |
426 |
|
--- smeserver-phpvirtualbox-5.2.1.old/root/etc/e-smith/db/configuration/migrate/phpvirtualbox 2023-03-07 16:49:37.500223500 +1100 |
427 |
|
+++ smeserver-phpvirtualbox-5.2.1/root/etc/e-smith/db/configuration/migrate/phpvirtualbox 2023-03-08 10:45:22.565554001 +1100 |
428 |
|
@@ -13,11 +13,17 @@ |
429 |
|
$rec->set_prop('userGroups', $rec->prop('Group')); |
430 |
|
$rec->del_prop('Group'); |
431 |
|
} |
432 |
|
+ if ( -e '/etc/e-smith/db/configuration/defaults/Group') { |
433 |
|
+ unlink '/etc/e-smith/db/configuration/defaults/Group'; |
434 |
|
+ } |
435 |
|
|
436 |
|
# User replaced by Users, because it already allows for multiple users |
437 |
|
if ($rec->prop('User')) { |
438 |
|
$rec->set_prop('Users', $rec->prop('User')); |
439 |
|
$rec->del_prop('User'); |
440 |
|
} |
441 |
|
+ if ( -e '/etc/e-smith/db/configuration/defaults/User') { |
442 |
|
+ unlink '/etc/e-smith/db/configuration/defaults/User'; |
443 |
|
+ } |
444 |
|
|
445 |
|
} |