@@ -1441,6 +1453,7 @@ var startup = true;
var stopgap = ' | ';
var recall = null;
var recover = null;
+var tempunit="";
// Helper function to calculate millisPerPixel based on container width
function getMillisPerPixel(timeInSeconds, containerId) {
@@ -1695,6 +1708,39 @@ function addChartNet(rx, tx) {
txTimeSeries.append(now, Math.floor(tx / 1000));
}
+function updateCPUPower() {
+ if (!cpupower) return;
+
+ // Update total power
+ const totalEl = document.getElementById('cpu-total-power');
+ const totalPower = cpupower.totalPower ?? 0;
+ if (totalEl) {
+ totalEl.innerHTML = ` _(Total)_ _(Power)_: ${totalPower.toFixed(2)} W`;
+ }
+
+ // Update each core's span
+ const cpuspower = cpupower.power ?? [];
+ cpuspower.forEach((power, index) => {
+ const coreEl = document.getElementById(`cpu-power${index}`);
+ if (coreEl) {
+ coreEl.innerHTML = `${power.toFixed(2)} W`;
+ }
+ });
+
+ const cpustemps = cpupower.temp ?? [];
+ cpustemps.forEach((temp, index) => {
+ const coreTempEl = document.getElementById(`cpu-temp${index}`);
+ if (coreTempEl) {
+ tempdisplay = temp.toFixed(0);
+ if (tempunit === "F") {
+ tempdisplay = ((temp.toFixed(0))* 9 / 5) + 32;
+ }
+ coreTempEl.innerHTML = Math.round(tempdisplay)+` °`+tempunit;;
+ }
+ });
+
+}
+
// Cache for last values to avoid unnecessary DOM updates
var lastCpuValues = {
load: -1,
@@ -2770,6 +2816,60 @@ $(function() {
setTimeout(function() {
// Charts initialized
},500);
+
+
+
+ // Start GraphQL CPU power subscription with retry logic
+ let cpuInitPWRAttempts = 0, cpuPWRRetryMs = 100;
+ function initPwrCpuSubscription() {
+
+
+ if (window.gql && window.apolloClient) {
+ // Define the subscription query when GraphQL is available
+ // corepower has the temps currently.
+ CPU_POWER_SUBSCRIPTION = window.gql(`
+ subscription SystemMetricsCpuTelemetry {
+ systemMetricsCpuTelemetry {
+ totalPower,
+ power,
+ temp,
+ }
+ }
+ `);
+ cpuPowerSubscription = window.apolloClient.subscribe({
+ query: CPU_POWER_SUBSCRIPTION
+ }).subscribe({
+ next: (result) => {
+
+
+ if (result.data?.systemMetricsCpuTelemetry){
+ cpupower = result.data.systemMetricsCpuTelemetry;
+
+ updateCPUPower();
+ }
+ },
+ error: (err) => {
+ console.error('CPU power subscription error:', err);
+ // Try to resubscribe with capped backoff
+ if (cpuPowerSubscription) { try { cpuPowerSubscription.unsubscribe(); } catch(e){} }
+ setTimeout(initPwrCpuSubscription, Math.min(cpuPWRRetryMs *= 2, 5000));
+ }
+ });
+ } else {
+ // Retry with capped backoff if GraphQL client not ready
+ cpuInitPWRAttempts++;
+ setTimeout(initPwrCpuSubscription, Math.min(cpuPWRRetryMs *= 2, 2000));
+ }
+ }
+ initPwrCpuSubscription();
+ // Cleanup GraphQL subscription on page unload
+ $(window).on('beforeunload', function() {
+ if (cpuPowerSubscription) {
+ cpuPowerSubscription.unsubscribe();
+ }
+ });
+
+
// Cleanup GraphQL subscription on page unload
$(window).on('beforeunload', function() {
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 88df03ea2..e07dd554b 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -344,9 +344,9 @@ function selectDiskFsWidthZFS(slots,init) {
value: width,
text: _(sprintf('%s '+label+' of %s devices',groups,width)),
}));
+ if (selected_width == 0) selected_width = width;
}
}
- selected_width = slots;
}
$('#diskFsWidth').val(selected_width);
}
@@ -990,7 +990,7 @@ _(Critical disk utilization threshold)_ (%):
-
+
_(Pool Device Status)_
diff --git a/emhttp/plugins/dynamix/MoverSettings.page b/emhttp/plugins/dynamix/MoverSettings.page
index 4ca5a060e..e6576111a 100755
--- a/emhttp/plugins/dynamix/MoverSettings.page
+++ b/emhttp/plugins/dynamix/MoverSettings.page
@@ -15,6 +15,8 @@ Tag="calendar-check-o"
*/
?>
"._('No Cache device present')."!";
@@ -23,11 +25,13 @@ if (!$pool_devices) {
echo ""._('User shares not enabled')."! ";
$setup = false;
}
-$cron = explode(' ',$var['shareMoverSchedule']);
-$move = $cron[2]!='*' ? 3 : ($cron[4]!='*' ? 2 : (substr($cron[1],0,1)!='*' ? 1 : 0));
-$mode = ['Hourly','Daily','Weekly','Monthly'];
-$days = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];
-
+if (empty($var['shareMoverSchedule'])) {
+ $cron = explode(' ', "* * * * *");
+ $move = 0;
+} else {
+ $cron = explode(' ', $var['shareMoverSchedule']);
+ $move = $cron[2]!='*' ? 4 : ($cron[4]!='*' ? 3 : (substr($cron[1],0,1)!='*' ? 2 : 1));
+}
$showMoverButton = $setup && $pool_devices;
$moverRunning = file_exists('/var/run/mover.pid');
?>
@@ -37,27 +41,33 @@ $(function() {
presetMover(document.mover_schedule);
});
+function presetMover(form) {
+ var mode = form.shareMoverSchedule.value;
+ form.min.disabled = mode==0;
+ form.day.disabled = mode==0 || mode!=3;
+ form.dotm.disabled = mode==0 || mode!=4;
+ form.hour1.disabled = mode==0;
+ form.hour2.disabled = mode==0;
+ form.day.value = form.day.disabled ? '*' : (form.day.value=='*' ? 0 : form.day.value);
+ form.dotm.value = form.dotm.disabled ? '*' : (form.dotm.value=='*' ? 1 : form.dotm.value);
+ if (mode==1) {$('#H1').hide(); $('#H2').show();} else {$('#H2').hide(); $('#H1').show();}
+}
// Fool Unraid by simulating the original input field
function prepareMover(form) {
var mode = form.shareMoverSchedule.value;
- var min = mode!=0 ? form.min.value : 0;
- var hour = mode!=0 ? form.hour1.value : form.hour2.value;
- form.shareMoverSchedule.options[mode].value = min+' '+hour+' '+form.dotm.value+' * '+form.day.value;
+ if (mode == 0)
+ form.shareMoverSchedule.options[mode].value = '';
+ else {
+ var hour = mode!=1 ? form.hour1.value : form.hour2.value;
+ var min = mode!=1 ? form.min.value : 0;
+ form.shareMoverSchedule.options[mode].value = min+' '+hour+' '+form.dotm.value+' * '+form.day.value;
+ }
form.min.disabled = true;
form.hour1.disabled = true;
form.hour2.disabled = true;
form.dotm.disabled = true;
form.day.disabled = true;
}
-function presetMover(form) {
- var mode = form.shareMoverSchedule.value;
- form.min.disabled = false;
- form.day.disabled = mode!=2;
- form.dotm.disabled = mode!=3;
- form.day.value = form.day.disabled ? '*' : (form.day.value=='*' ? 0 : form.day.value);
- form.dotm.value = form.dotm.disabled ? '*' : (form.dotm.value=='*' ? 1 : form.dotm.value);
- if (mode==0) {$('#H1').hide(); $('#H2').show();} else {$('#H2').hide(); $('#H1').show();}
-}
-
+ isSidebarTheme()): ?>
-
+ isSidebarTheme()): ?>
+
+
diff --git a/emhttp/plugins/dynamix/include/Helpers.php b/emhttp/plugins/dynamix/include/Helpers.php
index 8b4bc99c7..16fcdb874 100644
--- a/emhttp/plugins/dynamix/include/Helpers.php
+++ b/emhttp/plugins/dynamix/include/Helpers.php
@@ -565,10 +565,8 @@ function dmidecode($key, $n, $all=true) {
}
function is_intel_cpu() {
- $cpu = dmidecode('Processor Information','4',0);
- $cpu_vendor = $cpu['Manufacturer'] ?? "";
- $is_intel_cpu = stripos($cpu_vendor, "intel") !== false ? true : false;
- return $is_intel_cpu;
+ $cpu_vendor_check = exec("grep -Pom1 '^model name\s+:\s*\K.+' /proc/cpuinfo") ?? "";
+ return stripos($cpu_vendor_check, "intel") !== false;
}
// Load saved PCI data
@@ -874,7 +872,6 @@ function get_cpu_packages(string $separator = ','): array {
return $packages;
}
-
function getIpAddressesByPci(string $pciAddress): array
{
$base = "/sys/bus/pci/devices/$pciAddress/net";
diff --git a/emhttp/plugins/dynamix/include/cpulist.php b/emhttp/plugins/dynamix/include/cpulist.php
new file mode 100644
index 000000000..8d1db3573
--- /dev/null
+++ b/emhttp/plugins/dynamix/include/cpulist.php
@@ -0,0 +1,22 @@
+ (int)explode($separator, $s)[0], $list);
+ array_multisort($keys, SORT_ASC, SORT_NUMERIC, $list);
+ }
+ unset($list);
+
+ return $packages;
+}
diff --git a/emhttp/plugins/dynamix/scripts/diagnostics b/emhttp/plugins/dynamix/scripts/diagnostics
index e6d3be1f8..859c37b89 100755
--- a/emhttp/plugins/dynamix/scripts/diagnostics
+++ b/emhttp/plugins/dynamix/scripts/diagnostics
@@ -497,7 +497,7 @@ run("lscpu 2>/dev/null|todos >".escapeshellarg("/$diag/system/lscpu.txt"));
run("lsscsi -vgl 2>/dev/null|todos >".escapeshellarg("/$diag/system/lsscsi.txt"));
run("lspci -knn 2>/dev/null|todos >".escapeshellarg("/$diag/system/lspci.txt"));
run("lspci -vv 2>/dev/null| awk -b '/ASPM/{print $0}' RS=|grep -P '(^[a-z0-9:.]+|ASPM |Disabled;|Enabled;)'|todos >".escapeshellarg("/$diag/system/aspm-status.txt"));
-run("lsusb 2>/dev/null|todos >".escapeshellarg("/$diag/system/lsusb.txt"));
+run("lsusb -vt 2>/dev/null|todos >".escapeshellarg("/$diag/system/lsusb.txt"));
run("free -mth 2>/dev/null|todos >".escapeshellarg("/$diag/system/memory.txt"));
run("lsof -Pni 2>/dev/null|todos >".escapeshellarg("/$diag/system/lsof.txt"));
run("lsmod|sort 2>/dev/null|todos >".escapeshellarg("/$diag/system/lsmod.txt"));
diff --git a/emhttp/plugins/dynamix/scripts/notify b/emhttp/plugins/dynamix/scripts/notify
index 8a5adc246..1c4db802b 100755
--- a/emhttp/plugins/dynamix/scripts/notify
+++ b/emhttp/plugins/dynamix/scripts/notify
@@ -104,6 +104,37 @@ function clean_subject($subject) {
return $subject;
}
+/**
+ * Wrap string values in double quotes for INI compatibility and escape quotes/backslashes.
+ * Numeric types remain unquoted so they can be parsed as-is.
+ */
+function ini_encode_value($value) {
+ if (is_int($value) || is_float($value)) return $value;
+ if (is_bool($value)) return $value ? 'true' : 'false';
+ $value = (string)$value;
+ return '"'.strtr($value, ["\\"=>"\\\\", '"' => '\\"']).'"';
+}
+
+function build_ini_string(array $data) {
+ $lines = [];
+ foreach ($data as $key => $value) {
+ $lines[] = "{$key}=".ini_encode_value($value);
+ }
+ return implode("\n", $lines)."\n";
+}
+
+/**
+ * Trims and unescapes strings (eg quotes, backslashes) if necessary.
+ */
+function ini_decode_value($value) {
+ $value = trim($value);
+ $length = strlen($value);
+ if ($length >= 2 && $value[0] === '"' && $value[$length-1] === '"') {
+ return stripslashes(substr($value, 1, -1));
+ }
+ return $value;
+}
+
// start
if ($argc == 1) exit(usage());
@@ -222,10 +253,29 @@ case 'add':
$archive = "{$archive}/".safe_filename("{$event}-{$ticket}.notify");
if (file_exists($archive)) break;
$entity = $overrule===false ? $notify[$importance] : $overrule;
- if (!$mailtest) file_put_contents($archive,"timestamp=$timestamp\nevent=$event\nsubject=$subject\ndescription=$description\nimportance=$importance\n".($message ? "message=".str_replace('\n','
',$message)."\n" : ""));
- if (($entity & 1)==1 && !$mailtest && !$noBrowser) file_put_contents($unread,"timestamp=$timestamp\nevent=$event\nsubject=$subject\ndescription=$description\nimportance=$importance\nlink=$link\n");
- if (($entity & 2)==2 || $mailtest) generate_email($event, clean_subject($subject), str_replace('
','. ',$description), $importance, $message, $recipients, $fqdnlink);
- if (($entity & 4)==4 && !$mailtest) { if (is_array($agents)) {foreach ($agents as $agent) {exec("TIMESTAMP='$timestamp' EVENT=".escapeshellarg($event)." SUBJECT=".escapeshellarg(clean_subject($subject))." DESCRIPTION=".escapeshellarg($description)." IMPORTANCE=".escapeshellarg($importance)." CONTENT=".escapeshellarg($message)." LINK=".escapeshellarg($fqdnlink)." bash ".$agent);};}};
+ $cleanSubject = clean_subject($subject);
+ $archiveData = [
+ 'timestamp' => $timestamp,
+ 'event' => $event,
+ 'subject' => $cleanSubject,
+ 'description' => $description,
+ 'importance' => $importance,
+ ];
+ if ($message) $archiveData['message'] = str_replace('\n','
',$message);
+ if (!$mailtest) file_put_contents($archive, build_ini_string($archiveData));
+ if (($entity & 1)==1 && !$mailtest && !$noBrowser) {
+ $unreadData = [
+ 'timestamp' => $timestamp,
+ 'event' => $event,
+ 'subject' => $cleanSubject,
+ 'description' => $description,
+ 'importance' => $importance,
+ 'link' => $link,
+ ];
+ file_put_contents($unread, build_ini_string($unreadData));
+ }
+ if (($entity & 2)==2 || $mailtest) generate_email($event, $cleanSubject, str_replace('
','. ',$description), $importance, $message, $recipients, $fqdnlink);
+ if (($entity & 4)==4 && !$mailtest) { if (is_array($agents)) {foreach ($agents as $agent) {exec("TIMESTAMP='$timestamp' EVENT=".escapeshellarg($event)." SUBJECT=".escapeshellarg($cleanSubject)." DESCRIPTION=".escapeshellarg($description)." IMPORTANCE=".escapeshellarg($importance)." CONTENT=".escapeshellarg($message)." LINK=".escapeshellarg($fqdnlink)." bash ".$agent);};}};
break;
case 'get':
@@ -241,9 +291,12 @@ case 'get':
$output[$i]['show'] = (fileperms($file) & 0x0FFF)==0400 ? 0 : 1;
foreach ($fields as $field) {
if (!$field) continue;
- [$key,$val] = array_pad(explode('=', $field),2,'');
+ # limit the explode('=', …) used during reads to two pieces so values containing = remain intact
+ [$key,$val] = array_pad(explode('=', $field, 2),2,'');
if ($time) {$val = date($notify['date'].' '.$notify['time'], $val); $time = false;}
- $output[$i][trim($key)] = trim($val);
+ # unescape the value before emitting JSON, so the browser UI
+ # and any scripts calling `notify get` still see plain strings
+ $output[$i][trim($key)] = ini_decode_value($val);
}
$i++;
}
diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index 164202fdc..1f358713c 100755
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -139,15 +139,15 @@ hr {
resize: none;
}
-input[type="text"],
-input[type="password"],
-input[type="number"],
-input[type="url"],
-input[type="email"],
-input[type="date"],
-input[type="file"],
-textarea,
-.textarea {
+input[type="text"]:where(:not(.unapi *)),
+input[type="password"]:where(:not(.unapi *)),
+input[type="number"]:where(:not(.unapi *)),
+input[type="url"]:where(:not(.unapi *)),
+input[type="email"]:where(:not(.unapi *)),
+input[type="date"]:where(:not(.unapi *)),
+input[type="file"]:where(:not(.unapi *)),
+textarea:where(:not(.unapi *)),
+.textarea:where(:not(.unapi *)) {
color: var(--text-color);
font-family: clear-sans;
font-size: 1.3rem;
@@ -181,12 +181,12 @@ select:focus {
}
}
-input[type="button"],
-input[type="reset"],
-input[type="submit"],
-button,
-button[type="button"],
-a.button {
+input[type="button"]:where(:not(.unapi *)),
+input[type="reset"]:where(:not(.unapi *)),
+input[type="submit"]:where(:not(.unapi *)),
+button:where(:not(.unapi *)),
+button[type="button"]:where(:not(.unapi *)),
+a.button:where(:not(.unapi *)) {
font-family: clear-sans;
font-size: 1.1rem;
font-weight: bold;
@@ -250,48 +250,50 @@ input[type="number"]::-webkit-inner-spin-button {
input[type="number"] {
-moz-appearance: textfield;
}
-input:focus[type="text"],
-input:focus[type="password"],
-input:focus[type="number"],
-input:focus[type="url"],
-input:focus[type="email"],
-input:focus[type="file"],
-textarea:focus {
+input:focus[type="text"]:where(:not(.unapi *)),
+input:focus[type="password"]:where(:not(.unapi *)),
+input:focus[type="number"]:where(:not(.unapi *)),
+input:focus[type="url"]:where(:not(.unapi *)),
+input:focus[type="email"]:where(:not(.unapi *)),
+input:focus[type="file"]:where(:not(.unapi *)),
+textarea:focus:where(:not(.unapi *)) {
background-color: var(--focus-input-bg-color);
outline: 0;
}
-input:hover[type="button"],
-input:hover[type="reset"],
-input:hover[type="submit"],
-button:hover,
-button:hover[type="button"],
-a.button:hover {
+input:hover[type="button"]:where(:not(.unapi *)),
+input:hover[type="reset"]:where(:not(.unapi *)),
+input:hover[type="submit"]:where(:not(.unapi *)),
+button:hover:where(:not(.unapi *)),
+button:hover[type="button"]:where(:not(.unapi *)),
+a.button:hover:where(:not(.unapi *)) {
color: var(--hover-button-text-color);
background: var(--hover-button-background);
}
-input[disabled],
-textarea[disabled] {
+input[disabled]:where(:not(.unapi *)),
+textarea[disabled]:where(:not(.unapi *)) {
color: var(--text-color);
border-bottom-color: var(--disabled-input-border-color);
opacity: 0.5;
cursor: default;
}
-input[type="button"][disabled],
-input[type="reset"][disabled],
-input[type="submit"][disabled],
-button[disabled],
-button[type="button"][disabled],
-a.button[disabled] input:hover[type="button"][disabled],
-input:hover[type="reset"][disabled],
-input:hover[type="submit"][disabled],
-button:hover[disabled],
-button:hover[type="button"][disabled],
-a.button:hover[disabled] input:active[type="button"][disabled],
-input:active[type="reset"][disabled],
-input:active[type="submit"][disabled],
-button:active[disabled],
-button:active[type="button"][disabled],
-a.button:active[disabled] {
+input[type="button"][disabled]:where(:not(.unapi *)),
+input[type="reset"][disabled]:where(:not(.unapi *)),
+input[type="submit"][disabled]:where(:not(.unapi *)),
+button[disabled]:where(:not(.unapi *)),
+button[type="button"][disabled]:where(:not(.unapi *)),
+a.button[disabled]:where(:not(.unapi *)),
+input:hover[type="button"][disabled]:where(:not(.unapi *)),
+input:hover[type="reset"][disabled]:where(:not(.unapi *)),
+input:hover[type="submit"][disabled]:where(:not(.unapi *)),
+button:hover[disabled]:where(:not(.unapi *)),
+button:hover[type="button"][disabled]:where(:not(.unapi *)),
+a.button:hover[disabled]:where(:not(.unapi *)),
+input:active[type="button"][disabled]:where(:not(.unapi *)),
+input:active[type="reset"][disabled]:where(:not(.unapi *)),
+input:active[type="submit"][disabled]:where(:not(.unapi *)),
+button:active[disabled]:where(:not(.unapi *)),
+button:active[type="button"][disabled]:where(:not(.unapi *)),
+a.button:active[disabled]:where(:not(.unapi *)) {
opacity: 0.5;
cursor: default;
color: var(--disabled-text-color);
@@ -333,7 +335,7 @@ a.button:active[disabled] {
input::-webkit-input-placeholder {
color: var(--link-text-color);
}
-select {
+select:where(:not(.unapi *)) {
-webkit-appearance: none;
font-family: clear-sans;
font-size: 1.3rem;
@@ -356,18 +358,18 @@ select {
display: inline-block;
cursor: pointer;
}
-select option {
+select:where(:not(.unapi *)) option {
color: var(--text-color);
background-color: var(--mild-background-color);
}
-select option:disabled {
+select:where(:not(.unapi *)) option:disabled {
color: var(--disabled-text-color);
}
-select:focus {
+select:focus:where(:not(.unapi *)) {
background-color: var(--focus-input-bg-color);
outline: 0;
}
-select[disabled] {
+select[disabled]:where(:not(.unapi *)) {
color: var(--text-color);
border-bottom-color: var(--disabled-border-color);
opacity: 0.5;
@@ -414,7 +416,7 @@ input.trim {
width: 76px;
min-width: 76px;
}
-textarea {
+textarea:where(:not(.unapi *)) {
resize: none;
padding: 6px;
border: 1px solid var(--textarea-border-color);
@@ -951,7 +953,7 @@ div.title span img {
-webkit-overflow-scrolling: touch;
}
-table {
+table:where(:not(.unapi *)) {
border-collapse: collapse;
border-spacing: 0;
border-style: hidden;
@@ -959,12 +961,12 @@ table {
width: 100%;
background-color: var(--background-color);
}
-table thead td {
+table:where(:not(.unapi *)) thead td {
line-height: 2.8rem;
height: 2.8rem;
white-space: nowrap;
}
-table tbody td {
+table:where(:not(.unapi *)) tbody td {
line-height: 2.6rem;
height: 2.6rem;
white-space: nowrap;
@@ -2563,7 +2565,7 @@ div#title.ud {
padding: 0;
}
- .LanguageButton {
+ .Theme--nav-top .LanguageButton {
font-size: 12px !important;
} /* Fix Switch Language Being Cut-Off */
@@ -2594,8 +2596,10 @@ div#title.ud {
}
.usage-bar {
- position: relative;
- width: 6.4rem;
+ position: absolute;
+ bottom: .5rem;
+ left: 50%;
+ width: 14rem;
margin: 0;
padding: 0;
}
diff --git a/etc/rc.d/rc.M b/etc/rc.d/rc.M
index 714bdf993..c875bf3ad 100755
--- a/etc/rc.d/rc.M
+++ b/etc/rc.d/rc.M
@@ -31,9 +31,6 @@ if [[ -x /etc/rc.d/rc.setterm ]]; then
/etc/rc.d/rc.setterm
fi
-# Set the hostname:
-hostname $(cat /etc/HOSTNAME)
-
# Set the permissions on /var/log/dmesg according to whether the kernel
# permits non-root users to access kernel dmesg information:
if [[ -r /proc/sys/kernel/dmesg_restrict ]]; then
@@ -246,7 +243,8 @@ fi
# Start avahi:
if [[ -x /etc/rc.d/rc.avahidaemon ]]; then
/etc/rc.d/rc.avahidaemon start
- /etc/rc.d/rc.avahidnsconfd start
+ # disable by default, users can start manually if needed
+ # /etc/rc.d/rc.avahidnsconfd start
fi
# Start Samba (a file/print server for Windows machines).
diff --git a/etc/rc.d/rc.S.cont b/etc/rc.d/rc.S.cont
index f5a4f954f..487d658bf 100755
--- a/etc/rc.d/rc.S.cont
+++ b/etc/rc.d/rc.S.cont
@@ -12,6 +12,14 @@
# run & log functions
. /etc/rc.d/rc.runlog
+# LimeTech - restore machine-id
+SRC="/boot/config/machine-id"
+DEST="/etc/machine-id"
+if [[ ! -f "$SRC" ]] || ! grep -Eq '^[0-9a-f]{32}$' "$SRC" ; then
+ /usr/bin/dbus-uuidgen --ensure="$SRC"
+fi
+/usr/bin/install -m 0644 "$SRC" "$DEST"
+
# LimeTech - bind selected devices to vfio-pci
/usr/local/sbin/vfio-pci 1>/var/log/vfio-pci 2>/var/log/vfio-pci-errors
@@ -217,9 +225,10 @@ if [[ -r /boot/config/ident.cfg ]]; then
. <(/usr/bin/fromdos /etc/HOSTNAME
+/bin/hostname "$NAME"
+/bin/hostname -s >/etc/hostname
/bin/echo "# Generated" >/etc/hosts
-/bin/echo "127.0.0.1 $NAME localhost" >>/etc/hosts
+/bin/echo "127.0.0.1 $NAME localhost" >>/etc/hosts
# LimeTech - restore the configured timezone
if [[ $timeZone == custom ]]; then
diff --git a/etc/rc.d/rc.avahidaemon b/etc/rc.d/rc.avahidaemon
index acdd434f1..33195164f 100755
--- a/etc/rc.d/rc.avahidaemon
+++ b/etc/rc.d/rc.avahidaemon
@@ -31,7 +31,7 @@ CALLER="avahi"
AVAHI="/usr/sbin/avahi-daemon"
CONF="/etc/avahi/avahi-daemon.conf"
HOSTS="/etc/hosts"
-NAME=$(/dev/null
+ if avahid_running; then
+ add_local_to_hosts
+ $AVAHI --reload 2>/dev/null
+ fi
}
avahid_update(){
diff --git a/etc/rc.d/rc.docker b/etc/rc.d/rc.docker
index d5ba3bf29..e9ac334d9 100755
--- a/etc/rc.d/rc.docker
+++ b/etc/rc.d/rc.docker
@@ -243,6 +243,8 @@ container_add_route(){
docker_network_start(){
log "Starting network..."
+ # ensure br_netfilter modules is loaded, re: https://github.com/moby/moby/issues/48948
+ modprobe br_netfilter
# create list of possible custom networks
EXCLUDE=; INCLUDE=$(ls --indicator-style=none $SYSTEM | awk '/^br[0-9]+/' ORS=' ')
while IFS=$'\n' read -r NETWORK; do
@@ -482,11 +484,11 @@ docker_network_start(){
fi
fi
done
- # create IPv6 forward accept rule
- if [[ $IPV6_FORWARD == accept ]]; then
- ip6tables -P FORWARD ACCEPT
- log "created forward accept rule for IPv6 network"
- fi
+# # create IPv6 forward accept rule
+# if [[ $IPV6_FORWARD == accept ]]; then
+# ip6tables -P FORWARD ACCEPT
+# log "created forward accept rule for IPv6 network"
+# fi
log "Network started."
}
@@ -573,6 +575,9 @@ docker_service_start(){
fi
nohup $UNSHARE --propagation slave -- $DOCKER -p $DOCKER_PIDFILE $DOCKER_OPTS >>$DOCKER_LOG 2>&1 &
wait_daemon
+ # after docket started, continue to accept non-docker IPv6 traffic on br0
+ ip6tables -P FORWARD ACCEPT
+# log "created forward accept rule for IPv6 network"
if docker_running; then REPLY="Started"; else REPLY="Failed"; fi
fi
log "$DAEMON... $REPLY."
diff --git a/etc/rc.d/rc.local b/etc/rc.d/rc.local
index d59ea8fca..5fbe4263d 100755
--- a/etc/rc.d/rc.local
+++ b/etc/rc.d/rc.local
@@ -190,6 +190,26 @@ else
log "Installing /boot/extra packages"
( export -f log; find /boot/extra -maxdepth 1 -type f -exec sh -c 'upgradepkg --terse --install-new "$1" | log' -- "{}" \; )
fi
+ # Move any downloaded plugins in $CONFIG/plugins-nextboot to $CONFIG/plugins so they can be installed
+ if [[ -d "$CONFIG/plugins-nextboot" ]]; then
+ shopt -s nullglob
+ for ITEM in "$CONFIG/plugins-nextboot"/*; do
+ if [[ -f "$ITEM" && "$ITEM" == *.plg ]]; then
+ # Move .plg files
+ mv "$ITEM" "$CONFIG/plugins/" && log "Moved $(basename "$ITEM") from plugins-nextboot to plugins"
+ elif [[ -d "$ITEM" ]]; then
+ # Merge plugin directories
+ PLUGIN_NAME=$(basename "$ITEM")
+ DEST_DIR="$CONFIG/plugins/$PLUGIN_NAME"
+ mkdir -p "$DEST_DIR"
+ cp -r "$ITEM"/* "$DEST_DIR/" 2>/dev/null
+ rm -rf "$ITEM"
+ log "Moved plugin directory $PLUGIN_NAME and contents from plugins-nextboot to plugins"
+ fi
+ done
+ shopt -u nullglob
+ rmdir "$CONFIG/plugins-nextboot" 2>/dev/null;
+ fi
PRIORITY_PLUGINS=("dynamix.unraid.net.plg")
# Install priority plugins first
for PRIORITY_PLUGIN in "${PRIORITY_PLUGINS[@]}"; do
diff --git a/etc/rc.d/rc.samba b/etc/rc.d/rc.samba
index 8d30144f8..a098b68c6 100755
--- a/etc/rc.d/rc.samba
+++ b/etc/rc.d/rc.samba
@@ -155,12 +155,17 @@ samba_stop(){
REPLY="Already stopped"
else
REPLY="Stopped"
+ # stop gracefully with SIGTERM the "master" smbd process first
+ master=$(pgrep --ns $$ -o smbd)
+ [[ -n "$master" ]] && run kill "$master"
+ sleep 1
# stop gracefully with SIGTERM
run killall --ns $$ smbd nmbd wsdd2 winbindd
samba_waitfor_shutdown
if samba_running; then
REPLY="Killed"
# stop forcibly with SIGKILL
+ [[ -n "$master" ]] && run kill -SIGKILL "$master"
run killall --ns $$ -SIGKILL smbd nmbd wsdd2 winbindd
samba_waitfor_shutdown
fi
diff --git a/sbin/mover b/sbin/mover
index 62a2afb2c..25107d999 100755
--- a/sbin/mover
+++ b/sbin/mover
@@ -28,21 +28,21 @@ CFGPATH="/boot/config/shares"
DEBUGGING=""
move() {
- find "$1" -depth 2>/dev/null | /usr/libexec/unraid/move $2 $DEBUGGING
+ find "$1" -depth 2>/dev/null | /usr/libexec/unraid/move $DEBUGGING
# second pass to clean up leftover empty directories
- find "$1" -depth -type d 2>/dev/null | /usr/libexec/unraid/move $2 $DEBUGGING
+ find "$1" -depth -type d 2>/dev/null | /usr/libexec/unraid/move $DEBUGGING
}
start() {
if [ -f $PIDFILE ]; then
if ps h $(cat $PIDFILE) | grep mover ; then
- echo "mover: already running"
+ echo "mover: already running" >&2
exit 1
fi
fi
echo $$ >/var/run/mover.pid
- echo "mover: started"
+ echo "mover: started" >&2
shopt -s nullglob
@@ -92,7 +92,7 @@ start() {
for SHAREPATH in /mnt/$DISK/* ; do
SHARE=$(basename "$SHAREPATH")
if [[ -d "$SHAREPATH" && -f "$CFGPATH/$SHARE.cfg" ]]; then
- move "$SHAREPATH" "-e"
+ move "$SHAREPATH"
fi
done
@@ -108,44 +108,7 @@ start() {
done
rm -f $PIDFILE
- echo "mover: finished"
-}
-
-empty() {
- DISK="$1"
-
- if [ -f $PIDFILE ]; then
- if ps h $(cat $PIDFILE) | grep mover ; then
- echo "mover: already running"
- exit 1
- fi
- fi
-
- echo $$ >/var/run/mover.pid
- echo "mover: started"
-
- shopt -s nullglob
-
- # we can only empty share directories
- for SHAREPATH in /mnt/$DISK/* ; do
- SHARE=$(basename "$SHAREPATH")
- if [[ -d "$SHAREPATH" && -f "$CFGPATH/$SHARE.cfg" ]]; then
- move "$SHAREPATH" "-e"
- fi
- done
-
- # output list of files which could not be moved
- # use 'find' in case huge number of files left in /mnt/$DISK
- count=$(find /mnt/$DISK -mindepth 1 | wc -l)
- if [ "$count" -gt 0 ]; then
- find /mnt/$DISK -mindepth 1 -depth -printf 'move: %p Not moved\n' | head -n 100
- if [ "$count" -gt 100 ]; then
- echo "[output truncated to first 100 entries]"
- fi
- fi
-
- rm -f $PIDFILE
- echo "mover: finished"
+ echo "mover: finished" >&2
}
killtree() {
@@ -170,43 +133,18 @@ stop() {
# display usage and then exit
usage() {
- echo "Usage: $0 start [-e ]"
- echo " $0 stop|status"
- echo " must match pattern 'disk[0-9]*' and /mnt/ must be a mountpoint"
+ echo "Usage: $0 start|stop|status"
exit 1
}
-# validate disk name
-validate_disk() {
- if [[ ! "$1" =~ ^disk[0-9]+$ ]]; then
- echo "Error: must match pattern 'disk[0-9]+$'"
- usage
- fi
- if ! mountpoint --nofollow /mnt/$1 > /dev/null 2>&1; then
- echo "Error: nothing mounted at /mnt/$1"
- usage
- fi
-}
-
-if [ "$#" -lt 1 ]; then
+if [ "$#" -ne 1 ]; then
usage
exit 1
fi
case $1 in
start)
- if [ -z "$2" ]; then
- start
- elif [ "$2" == "-e" ]; then
- if [ -z "$3" ]; then
- usage
- else
- validate_disk "$3"
- empty "$3"
- fi
- else
- usage
- fi
+ start
;;
stop)
stop
|