Attachment 161320 Details for Bug 203294 – next-try

next-try

isboot-kmod.shar (text/plain), 4.39 KB, created by Kurt Jaeger on 2015-09-24 05:47:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2015-09-24 05:47:32 UTC

Size: 4.39 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	isboot-kmod
>#	isboot-kmod/distinfo
>#	isboot-kmod/Makefile
>#	isboot-kmod/files
>#	isboot-kmod/files/patch-iscsi.c
>#	isboot-kmod/files/pkg-message.in
>#	isboot-kmod/pkg-descr
>#
>echo c - isboot-kmod
>mkdir -p isboot-kmod > /dev/null 2>&1
>echo x - isboot-kmod/distinfo
>sed 's/^X//' >isboot-kmod/distinfo << '07daa3846788eb27f8916607f7f65642'
>XSHA256 (isboot-0.2.10.tar.gz) = b801708256f789e1032f7be2db79f886919fddb7b9b26ec1835f68a8237c3b48
>XSIZE (isboot-0.2.10.tar.gz) = 30268
>07daa3846788eb27f8916607f7f65642
>echo x - isboot-kmod/Makefile
>sed 's/^X//' >isboot-kmod/Makefile << 'f0764be8f9a536ce9141badbe71b7b6d'
>XPORTNAME=       isboot-kmod
>XPORTVERSION=    0.2.10
>XDISTNAME=       isboot-${PORTVERSION}
>XCATEGORIES=     net
>XMASTER_SITES=   http://www.peach.ne.jp/archives/isboot/
>X
>XMAINTAINER=	john@jnielsen.net
>XCOMMENT=	Kernel module enabling iSCSI boot
>X
>XUSES=           kmod uidfix
>XSUB_FILES=	pkg-message
>XWRKSRC_SUBDIR=	src
>XPLIST_FILES=	${KMODDIR}/isboot.ko
>XPORTDOCS=	README
>X
>XOPTIONS_DEFINE=	DOCS VIMAGE
>XVIMAGE_DESC=	Build for a kernel with 'options VIMAGE'
>XVIMAGE_CFLAGS=	-DVIMAGE
>X
>Xpost-install-DOCS-on:
>X	${MKDIR} ${STAGEDIR}${DOCSDIR}
>X	cd ${WRKDIR}/${DISTNAME} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
>X
>X.include <bsd.port.mk>
>f0764be8f9a536ce9141badbe71b7b6d
>echo c - isboot-kmod/files
>mkdir -p isboot-kmod/files > /dev/null 2>&1
>echo x - isboot-kmod/files/patch-iscsi.c
>sed 's/^X//' >isboot-kmod/files/patch-iscsi.c << '55f12b4e262a98a9ad9acddd76b828d1'
>X--- iscsi.c.orig	2015-09-23 05:51:43 UTC
>X+++ iscsi.c
>X@@ -1036,24 +1036,30 @@ isboot_append_param(pdu_t *pp, char *for
>X 	return (n);
>X }
>X 
>X-#if __FreeBSD_version >= 1000050
>X+#if __FreeBSD_version < 1000050
>X+static void
>X+isboot_free_mbufext(void *p, void *optarg)
>X+#endif
>X+#if __FreeBSD_version >= 1000050 && __FreeBSD_version < 1100000
>X+#define EXT_FREE_OK 0
>X static int
>X isboot_free_mbufext(struct mbuf *m, void *p, void *optarg)
>X-#else
>X+#endif
>X+#if __FreeBSD_version >= 1100000
>X static void
>X-isboot_free_mbufext(void *p, void *optarg)
>X+isboot_free_mbufext(struct mbuf *m, void *p, void *optarg)
>X #endif
>X {
>X 
>X 	ISBOOT_TRACE("isboot_free_mbufext\n");
>X 	if (p == NULL)
>X-#if __FreeBSD_version >= 1000050
>X+#if __FreeBSD_version >= 1000050 && __FreeBSD_version < 1100000
>X 		return (EXT_FREE_OK);
>X #else
>X 		return;
>X #endif
>X 	isboot_free_mext(p);
>X-#if __FreeBSD_version >= 1000050
>X+#if __FreeBSD_version >= 1000050 && __FreeBSD_version < 1100000
>X 	return (EXT_FREE_OK);
>X #endif
>X }
>X@@ -1072,7 +1078,7 @@ isboot_xmit_pdu(struct isboot_sess *sess
>X 	    + sizeof(pp->hdr_dig) > MHLEN) {
>X 		panic("AHS=%d is too large", pp->ahs_len);
>X 	}
>X-	MGETHDR(mh, M_TRYWAIT, MT_DATA);
>X+	MGETHDR(mh, M_WAITOK, MT_DATA);
>X 	mh->m_pkthdr.rcvif = NULL;
>X 	memcpy(mh->m_data, &pp->ipdu, ISCSI_BHS_LEN);
>X 	mh->m_len = ISCSI_BHS_LEN;
>X@@ -1099,7 +1105,7 @@ isboot_xmit_pdu(struct isboot_sess *sess
>X 		/* allocate external buffer and add it to mbuf */
>X 		ds_dd = isboot_malloc_mext(ISCSI_ALIGN(pp->ds_len)
>X 		    + sizeof(pp->ds_dig));
>X-		MGET(md, M_TRYWAIT, MT_DATA);
>X+		MGET(md, M_WAITOK, MT_DATA);
>X #if __FreeBSD_version >= 800016
>X 		MEXTADD(md, (caddr_t)ds_dd, (ISCSI_ALIGN(pp->ds_len)
>X 			+ sizeof(pp->ds_dig)),
>55f12b4e262a98a9ad9acddd76b828d1
>echo x - isboot-kmod/files/pkg-message.in
>sed 's/^X//' >isboot-kmod/files/pkg-message.in << '13aa1c2a0a338169ca42a1ee98fb57a0'
>XRemember to have the module loaded at boot by adding the following to
>X/boot/loader.conf:
>X  isboot_load="YES"
>X
>XSee %%DOCSDIR%%/README for additional information.
>13aa1c2a0a338169ca42a1ee98fb57a0
>echo x - isboot-kmod/pkg-descr
>sed 's/^X//' >isboot-kmod/pkg-descr << '0645ee9e0f0627f6951da9154fefe2de'
>XThis installs Daisuke Aoyama's isboot kernel module, which allows booting
>XFreeBSD directly from an iSCSI root disk. If your BIOS supports iSCSI you may
>Xconfigure your target settings in the BIOS and boot directly. If not, you may
>XPXE boot using software that contains iSCSI support such as iPXE. The module
>Xreads the iSCSI Boot Firmware Table (IBFT) to configure the network and
>Xre-attach the volume once the kernel begins execution.
>X
>XWWW: http://shell.peach.ne.jp/aoyama/archives/2115 (Japanese)
>0645ee9e0f0627f6951da9154fefe2de
>exit
>

Actions: View

Attachments on bug 203294: 161313 | 161315 | 161318 | 161319 | 161320