Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: iscsi-tools install prefix #265

Merged
merged 1 commit into from
Nov 14, 2023
Merged

fix: iscsi-tools install prefix #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions storage/iscsi-tools/iscsid.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ container:
options:
- bind
- ro
- source: /var/lib/iscsi
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

previously it used /etc/iscsi which was a mount

destination: /var/lib/iscsi
type: bind
options:
- rshared
- rbind
- rw
- source: /run/lock/iscsi
destination: /run/lock/iscsi
type: bind
Expand Down
12 changes: 6 additions & 6 deletions storage/iscsi-tools/open-iscsi/pkg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ steps:
meson setup \
-Db_lto=true \
-Dno_systemd=true \
-Drulesdir="/usr/local/etc/udev/rules.d" \
-Dprefix=/usr/local \
-Discsi_sbindir=/usr/local/sbin \
-Drulesdir=/usr/local/etc/udev/rules.d \
-Dc_args="$CFLAGS -I/usr/local/include -DNO_SYSTEMD -DGLOB_ONLYDIR=0" \
output

Expand All @@ -59,11 +61,9 @@ steps:
DESTDIR=/rootfs ninja -C output install

# cleanup
rm -rf /rootfs/usr/local/share
rm -rf /rootfs/usr/local/include
rm -rf /rootfs/usr/local/lib/pkgconfig
rm -rf /rootfs/usr/local/etc/iscsi/ifaces
rm -rf /rootfs/etc
# we generate a one time initiatorname.iscsi when the iscsid-wrapper starts.
rm -rf /rootfs/usr/local/{etc/iscsi/initiatorname.iscsi,share,include,pkgconfig}
rm -rf /rootfs/var/lib/iscsi

cp /pkg/files/passwd /rootfs/usr/local/etc/passwd
finalize:
Expand Down