diff --git a/live-build/config/hooks/vm-artifacts/90-raw-disk-image.binary b/live-build/config/hooks/vm-artifacts/90-raw-disk-image.binary index e52013da..ab90ddf9 100755 --- a/live-build/config/hooks/vm-artifacts/90-raw-disk-image.binary +++ b/live-build/config/hooks/vm-artifacts/90-raw-disk-image.binary @@ -292,7 +292,7 @@ rsync --info=stats3 -Wa binary/* "$DIRECTORY/" # automatically whenever we boot into the crash kernel. # cat <<-EOF >"$DIRECTORY/etc/fstab" - rpool/ROOT/$FSNAME/home /home zfs defaults,x-systemd.before=zfs-import-cache.service nodev 0 0 + rpool/ROOT/$FSNAME/home /home zfs defaults,x-systemd.before=zfs-import-cache.service, nodev 0 0 rpool/ROOT/$FSNAME/data /var/delphix zfs defaults,x-systemd.before=zfs-import-cache.service 0 0 rpool/ROOT/$FSNAME/log /var/log zfs defaults,x-systemd.before=zfs-import-cache.service 0 0 rpool/crashdump /var/crash zfs defaults,x-systemd.before=zfs-import-cache.service,x-systemd.before=kdump-tools.service 0 0 @@ -341,4 +341,4 @@ retry 5 10 zfs umount "$FSNAME/ROOT/$FSNAME/root" retry 5 10 zpool export "$FSNAME" kpartx -d "$ARTIFACT_NAME.img" -ln -s /export/home /home \ No newline at end of file +ln -s /home /export/home \ No newline at end of file diff --git a/scripts/common.sh b/scripts/common.sh index 7efd2fef..53d54d34 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -36,7 +36,7 @@ function resolve_s3_uri() { # mirror is used. # UPSTREAM_BRANCH=$(get_upstream_or_fail_if_unset) || exit 1 - echo "Running with UPSTREAM_BRANCH set to ${UPSTREAM_BRANCH}" + #echo "Running with UPSTREAM_BRANCH set to ${UPSTREAM_BRANCH}" local latest_subprefix="linux-pkg/${UPSTREAM_BRANCH}/combine-packages/post-push/latest" local bucket="snapshot-de-images" local jenkinsid="jenkins-ops"