debian-nas-20231002

scpcom · Nov 10, 2023 · 28263b0 · 28263b0
1 parent ce089bc
commit 28263b0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/archives/openmediavault-6.9.x-webif-smart.patch b/archives/openmediavault-6.9.x-webif-smart.patch
@@ -0,0 +1,15 @@
+--- a/usr/share/php/openmediavault/system/storage/smartinformation.inc	2023-09-10 21:20:24.096781279 +0200
++++ b/usr/share/php/openmediavault/system/storage/smartinformation.inc	2023-09-10 21:33:15.078035485 +0200
+@@ -133,9 +133,9 @@
+ 		// Bit 0: Command line did not parse
+ 		// Bit 1: Device open failed, or device did not return an
+ 		//        IDENTIFY DEVICE structure
+-		if (($exitStatus !== 0) && (($exitStatus & 0) || ($exitStatus & 1))) {
+-			throw new \OMV\ExecException($cmd, $output, $exitStatus);
+-		}
++		//if (($exitStatus !== 0) && (($exitStatus & 0) || ($exitStatus & 1))) {
++		//	throw new \OMV\ExecException($cmd, $output, $exitStatus);
++		//}
+ 		$this->cmdOutput = $output;
+
+ 		// Set flag to mark information has been successfully read.
diff --git a/build-debian.sh b/build-debian.sh
@@ -1335,7 +1335,7 @@ cd -
 
 cd ${ltspBase}${cpuArch}/
 
-[ -e ${ltspBase}fw/newroot.tar.gz ] && tar xzvf ${ltspBase}fw/newroot.tar.gz
+[ -e ${ltspBase}fw/newroot.tar.gz ] && tar --keep-directory-symlink -xzvf ${ltspBase}fw/newroot.tar.gz
 
 if [ -e ${ltspBase}${cpuArch}/root/board-debs/install-linux.sh ]; then
   true
@@ -1433,6 +1433,8 @@ if [ "${boardModel}" != "onboot" ]; then
   sed -i 's|/usr/local/bin/zy-sysdisk-mount|true #/usr/local/bin/zy-sysdisk-mount|g' ${ltspBase}${cpuArch}/debinit.sh
 fi
 
+sed -i 's|tar xzf ${FWOUTPATH}/newroot.tar.gz|tar --keep-directory-symlink -xzf ${FWOUTPATH}/newroot.tar.gz|g' ${ltspBase}${cpuArch}/usr/local/bin/zy-init-get
+
 sed -i 's|^/usr/local/bin/start-md.sh|#/usr/local/bin/start-md.sh|g' ${ltspBase}${cpuArch}/debinit.sh
 sed -i 's|^/usr/local/bin/mount-md.sh|#/usr/local/bin/mount-md.sh|g' ${ltspBase}${cpuArch}/debinit.sh